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

[jgallimore]

Author: jgallimore
Date: Wed Apr 20 10:12:57 2011
New Revision: 1095346

URL: http://svn.apache.org/viewvc?rev=1095346&view=rev
Log:
Make safeBind a little quieter to remove some exceptions from openejb.log

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

Modified: 
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java?rev=1095346&r1=1095345&r2=1095346&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
 (original)
+++ 
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
 Wed Apr 20 10:12:57 2011
@@ -748,6 +748,18 @@ public class TomcatWebAppBuilder impleme
      */
     private void safeBind(Context comp, String name, Object value) {
         try {
+               Object lookup = null;
+               
+               try {
+                               lookup = comp.lookup(name);
+                       } catch (Exception e) {
+                       }
+                       
+                       if (lookup != null) {
+                               logger.info(name + " already bound, ignoring");
+                               return;
+                       }
+                       
             comp.bind(name, value);
         } catch (NamingException e) {
             logger.error("Error in safeBind method", e);