| commit | f271b6ac792e43e863f0f84c6a2fa1adae335ae3 | [log] [tgz] |
|---|---|---|
| author | Mark Struberg <struberg@apache.org> | Thu Dec 21 14:28:43 2017 +0100 |
| committer | Mark Struberg <struberg@apache.org> | Thu Dec 21 14:28:43 2017 +0100 |
| tree | 713fe480e33f34b0c91fda75972f8410e14fe3e3 | |
| parent | 79a1ae24903092aa78f6cd718566a03311784572 [diff] |
fix dynamic Config Converters for old Weld1 versions
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java index 1a2a391..164dc16 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java
@@ -224,12 +224,9 @@ cdiFilters.add(filter.getBean()); } - public void findDynamicProducer(@Observes ProcessBean<DynamicBeanProducer> processBean) + public void findDynamicProducer(@Observes ProcessProducerMethod<?, DynamicBeanProducer> processBean) { - if (processBean instanceof ProcessProducerMethod) - { - dynamicProducer = processBean.getBean(); - } + dynamicProducer = processBean.getBean(); } public void collectDynamicTypes(@Observes ProcessBean<?> processBean)
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/MapConfigSource.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/MapConfigSource.java index 9cd80ad..29ae289 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/MapConfigSource.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/MapConfigSource.java
@@ -28,6 +28,12 @@ private final Map<String, String> map; + // only needed for some old Weld versions + public MapConfigSource() + { + map = null; + } + public MapConfigSource(Map<String, String> map) { this.map = map;