You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/12/01 10:22:19 UTC
tomee git commit: don't inherit @Configuration for
@ApplicationConfiguration
Repository: tomee
Updated Branches:
refs/heads/develop fc7fc3e9f -> 4f83cf1fa
don't inherit @Configuration for @ApplicationConfiguration
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4f83cf1f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4f83cf1f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4f83cf1f
Branch: refs/heads/develop
Commit: 4f83cf1fa33393915ada64aaddd8f8aa2486d944
Parents: fc7fc3e
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Dec 1 10:22:12 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Dec 1 10:22:12 2014 +0100
----------------------------------------------------------------------
.../main/java/org/apache/openejb/testing/ApplicationComposers.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/4f83cf1f/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
index 7fbd01f..ce941ee 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
@@ -702,7 +702,7 @@ public final class ApplicationComposers {
}
// config for the app
- for (final Map.Entry<Object, List<Method>> method : findAnnotatedMethods(configs, ApplicationConfiguration.class).entrySet()) {
+ for (final Map.Entry<Object, List<Method>> method : findAnnotatedMethods(new HashMap<Object, List<Method>>(), ApplicationConfiguration.class).entrySet()) {
for (final Method m : method.getValue()) {
final Object o = m.invoke(method.getKey());
if (Properties.class.isInstance(o)) {