commit c1d323d2399c72d2a873508367cf8fcdb517f362
author Borislav Kapukaranov <b.kapukaranov@gmail.com> Thu Mar 14 12:32:54 2013 +0200
committer Borislav Kapukaranov <b.kapukaranov@gmail.com> Thu Mar 14 12:32:54 2013 +0200
tree 4de2587c74c422d1ab9b0812ac4c701138b9938e
parent a62a3b00eb24c66f2e1bf7dacd7e4106e9574588

Fix processing of @Resource annotation in openejb

hotfix/source/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java

diff --git a/hotfix/source/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java b/hotfix/source/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
index 058d657..48ad17b 100755
--- a/hotfix/source/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
+++ b/hotfix/source/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
@@ -734,8 +734,9 @@
             }
 
             String destinationId = (mappedName.length() == 0) ? ref.getName() : mappedName;
-            if (ignoredResources != null && ignoredResources.contains(destinationId)) {
-                ref.setLookupName(ignoredResourcesPrefix + destinationId);
+            if (ignoredResources != null && (ignoredResources.contains(destinationId) || ignoredResources.contains(correctedId(ignoredResourcesPrefix, destinationId)))) {
+                final String correctedId = ignoredResourcesPrefix + correctedId(ignoredResourcesPrefix, destinationId);
+                ref.setLookupName(correctedId);
                 ref.setName("openejb/" + moduleId + "/" + destinationId);
             } else {
                 try {