[openejb-scm] [2621] branches/v2_1/openejb2/modules/core/src/java/org/openejb/server/ejbd/JndiRequestHandler.java: JndiRequestHandler was reading client id as an object name when it is really an abstract name.

[dain]

Title: [2621] branches/v2_1/openejb2/modules/core/src/java/org/openejb/server/ejbd/JndiRequestHandler.java: JndiRequestHandler was reading client id as an object name when it is really an abstract name.

Revision

2621

Author

dain

Date

2006-04-22 23:03:16 -0400 (Sat, 22 Apr 2006)

Log Message

JndiRequestHandler was reading client id as an object name when it is really an abstract name.

Modified Paths

branches/v2_1/openejb2/modules/core/src/java/org/openejb/server/ejbd/JndiRequestHandler.java

Diff

Modified: branches/v2_1/openejb2/modules/core/src/java/org/openejb/server/ejbd/JndiRequestHandler.java (2620 => 2621)

--- branches/v2_1/openejb2/modules/core/src/java/org/openejb/server/ejbd/JndiRequestHandler.java	2006-04-21 22:53:42 UTC (rev 2620)
+++ branches/v2_1/openejb2/modules/core/src/java/org/openejb/server/ejbd/JndiRequestHandler.java	2006-04-23 03:03:16 UTC (rev 2621)
@@ -50,7 +50,6 @@
 import java.util.Set;
 
 import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
 import javax.naming.NamingException;
 
 import org.apache.commons.logging.Log;
@@ -100,8 +99,9 @@
             if (req.getClientModuleID() != null) {
                 contextClassLoader = thread.getContextClassLoader();
                 try {
-                    ObjectName objectName = new ObjectName(req.getClientModuleID());
-                    ClassLoader classLoader = KernelRegistry.getSingleKernel().getClassLoaderFor(objectName);
+                    URI uri = new URI(req.getClientModuleID());
+                    AbstractName abstractName = new AbstractName(uri);
+                    ClassLoader classLoader = KernelRegistry.getSingleKernel().getClassLoaderFor(abstractName);
                     thread.setContextClassLoader(classLoader);
                 } catch (Throwable e) {
                     replyWithFatalError(out, e, "Failed to set the correct classloader");
@@ -159,8 +159,9 @@
 
         if (req.getClientModuleID() != null) {
             try {
-                ObjectName objectName = new ObjectName(req.getClientModuleID());
-                Object context = KernelRegistry.getSingleKernel().getAttribute(objectName, "componentContext");
+                URI uri = new URI(req.getClientModuleID());
+                AbstractName abstractName = new AbstractName(uri);
+                Object context = KernelRegistry.getSingleKernel().getAttribute(abstractName, "componentContext");
 
                 res.setResponseCode(JNDI_CONTEXT_TREE);
                 res.setResult(context);