svn commit: r1056478 - /openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatThreadContextListener.java

[jlmonteiro]

Author: jlmonteiro
Date: Fri Jan  7 19:56:59 2011
New Revision: 1056478

URL: http://svn.apache.org/viewvc?rev=1056478&view=rev
Log:
Naming Exception in getThreadName sometimes

Modified:
    
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatThreadContextListener.java

Modified: 
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatThreadContextListener.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatThreadContextListener.java?rev=1056478&r1=1056477&r2=1056478&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatThreadContextListener.java
 (original)
+++ 
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatThreadContextListener.java
 Fri Jan  7 19:56:59 2011
@@ -24,6 +24,7 @@ import org.apache.openejb.util.LogCatego
 import org.apache.openejb.util.Logger;
 
 import javax.naming.NamingException;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 /**
@@ -116,6 +117,16 @@ public class TomcatThreadContextListener
         try {
             Object threadName = method.invoke(null);
             return threadName;
+
+        } catch (InvocationTargetException e) {
+            // if it's a naming exception, it should be treated by the caller
+            if (e.getCause() != null && e.getCause() instanceof 
NamingException) {
+                throw (NamingException) e.getCause();
+            }
+
+            logger.error("Exception in method getThreadName", e);
+            return null;
+
         } catch (Exception e) {
             logger.error("Exception in method getThreadName", e);
             return null;