geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: rev 57449 - geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment
Date Thu, 11 Nov 2004 17:46:14 GMT
Author: chirino
Date: Thu Nov 11 09:46:12 2004
New Revision: 57449

Modified:
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
Log:
Fix for GERONIMO-472: use the resourceAdapterIndex map instead of the connectionFactoryIndex
to lookup the resourceAdapater. 

Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
(original)
+++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
Thu Nov 11 09:46:12 2004
@@ -20,14 +20,14 @@
 import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
-import javax.management.ObjectName;
+
 import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
 import javax.naming.Reference;
 
 import org.apache.geronimo.deployment.DeploymentException;
 import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 
 /**
  * @version $Rev: 46019 $ $Date: 2004-09-14 02:56:06 -0700 (Tue, 14 Sep 2004) $
@@ -148,7 +148,7 @@
     }
 
     public void addResourceAdapterId(URI modulePath, String name, String containerId) throws
DeploymentException {
-        Map references = (Map) connectionFactoryIndex.get(name);
+        Map references = (Map) resourceAdapterIndex.get(name);
         if (references == null || references.isEmpty()) {
             references = new HashMap();
             resourceAdapterIndex.put(name, references);
@@ -224,7 +224,7 @@
     public String getResourceAdapterContainerId(URI module, String resourceLink, J2eeContext
j2eeContext) throws DeploymentException, UnknownEJBRefException {
         String name = resourceLink.substring(resourceLink.lastIndexOf('#') + 1);
         try {
-            return getContainerId(module, resourceLink, (Map) connectionFactoryIndex.get(name));
+            return getContainerId(module, resourceLink, (Map) resourceAdapterIndex.get(name));
         } catch (UnknownEJBRefException e) {
             ObjectName query = null;
             try {

Mime
View raw message