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 2012/09/13 13:03:31 UTC
svn commit: r1384273 -
/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
Author: rmannibucau
Date: Thu Sep 13 11:03:30 2012
New Revision: 1384273
URL: http://svn.apache.org/viewvc?rev=1384273&view=rev
Log:
handling of included package in tomcat scanning (was not correctly filtered)
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1384273&r1=1384272&r2=1384273&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java Thu Sep 13 11:03:30 2012
@@ -148,7 +148,12 @@ public class OpenEJBContextConfig extend
final URLClassLoader loader = new URLClassLoader(new URL[]{file.toURI().toURL()});
for (String webAnnotatedClassName : webAppInfo.webAnnotatedClasses) {
- final String classFile = webAnnotatedClassName.substring(getSubPackage(file).length()).replace('.', '/') + ".class";
+ final String includedPackage = getSubPackage(file);
+ if (includedPackage == null || !webAnnotatedClassName.startsWith(includedPackage)) {
+ continue;
+ }
+
+ final String classFile = webAnnotatedClassName.substring(includedPackage.length()).replace('.', '/') + ".class";
final URL classUrl = loader.getResource(classFile);
if (classUrl == null) {