You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tomee.apache.org by rm...@apache.org on 2013/04/26 13:52:00 UTC

svn commit: r1476151 - /tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java

Author: rmannibucau
Date: Fri Apr 26 11:51:59 2013
New Revision: 1476151

URL: http://svn.apache.org/r1476151
Log:
eclipse is weird adding jvm jar to the webapp when using wtp - handling it

Modified:
    tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1476151&r1=1476150&r2=1476151&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java Fri Apr 26 11:51:59 2013
@@ -498,6 +498,12 @@ public class OpenEJBContextConfig extend
                 return false;
             }
         }
+
+        if (classAsFile != null && classAsFile.getName().endsWith(".jar") && file.getName().endsWith(".jar")) {
+            // different jars
+            return false;
+        }
+
         return !webInf; // not in the file but not in a war too so use it
     }
 }