deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject deltaspike git commit: fix dynamic Config Converters for old Weld1 versions
Date Thu, 21 Dec 2017 13:30:09 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master 79a1ae249 -> f271b6ac7


fix dynamic Config Converters for old Weld1 versions


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/f271b6ac
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/f271b6ac
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/f271b6ac

Branch: refs/heads/master
Commit: f271b6ac792e43e863f0f84c6a2fa1adae335ae3
Parents: 79a1ae2
Author: Mark Struberg <struberg@apache.org>
Authored: Thu Dec 21 14:28:43 2017 +0100
Committer: Mark Struberg <struberg@apache.org>
Committed: Thu Dec 21 14:28:43 2017 +0100

----------------------------------------------------------------------
 .../deltaspike/core/impl/config/ConfigurationExtension.java   | 7 ++-----
 .../apache/deltaspike/core/impl/config/MapConfigSource.java   | 6 ++++++
 2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f271b6ac/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java
----------------------------------------------------------------------
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 @@ public class ConfigurationExtension implements Extension, Deactivatable
         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)

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f271b6ac/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/MapConfigSource.java
----------------------------------------------------------------------
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 @@ public abstract class MapConfigSource extends BaseConfigSource
 
     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;


Mime
View raw message