[jboss-svn-commits] JBL Code SVN: r34918 - labs/jbossesb/branches/JBESB_4_9_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap.

[jboss-svn-commits at lists.jboss.org]

Author: mageshbk at jboss.com
Date: 2010-08-27 03:17:34 -0400 (Fri, 27 Aug 2010)
New Revision: 34918

Modified:
   labs/jbossesb/branches/JBESB_4_9_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPProcessor.java
Log:
[JBESB-3470] - Made SOAPProcessor thread-safe

Modified: labs/jbossesb/branches/JBESB_4_9_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPProcessor.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_9_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPProcessor.java	2010-08-27 06:48:32 UTC (rev 34917)
+++ labs/jbossesb/branches/JBESB_4_9_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPProcessor.java	2010-08-27 07:17:34 UTC (rev 34918)
@@ -30,6 +30,7 @@
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
+import javax.naming.NameNotFoundException;
 import javax.servlet.ServletContext;
 
 import org.jboss.internal.soa.esb.publish.Publish;
@@ -224,11 +225,16 @@
                 Thread.currentThread().setContextClassLoader(initCL);
 
                 // Provide ENC for newer versions of JBossWS
-                final Context ctx = new javax.naming.InitialContext();
-                final Context enc = (Context)ctx.lookup("java:comp");
-                enc.createSubcontext("env");
+                final Context ctx = new InitialContext();
+                try {
+                    ctx.lookup("java:comp/env");
+                } catch (NameNotFoundException nnfe) {
+                    final Context enc = (Context)ctx.lookup("java:comp");
+                    enc.createSubcontext("env");
+                }
+
                 requestHandler.handleHttpRequest(endpoint, servletRequest, servletResponse, servletContext) ;
-                enc.destroySubcontext("env");
+                ctx.close();
             }
             finally
             {