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/01/21 19:34:17 UTC

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

Author: rmannibucau
Date: Mon Jan 21 18:34:16 2013
New Revision: 1436540

URL: http://svn.apache.org/viewvc?rev=1436540&view=rev
Log:
workaround to avoid regression on tcks (from tomcat 7.0.35)

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=1436540&r1=1436539&r2=1436540&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 Mon Jan 21 18:34:16 2013
@@ -38,6 +38,8 @@ import org.apache.openejb.loader.SystemI
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Logger;
 import org.apache.openejb.util.URLs;
+import org.apache.tomcat.util.bcel.classfile.AnnotationEntry;
+import org.apache.tomcat.util.bcel.classfile.ElementValuePair;
 import org.apache.tomcat.util.digester.Digester;
 import org.apache.tomee.common.NamingUtil;
 import org.apache.tomee.common.ResourceFactory;
@@ -388,6 +390,33 @@ public class OpenEJBContextConfig extend
         }
     }
 
+    @Override
+    protected void processAnnotationWebServlet(final String className, final AnnotationEntry ae, final WebXml fragment) {
+        try {
+            super.processAnnotationWebServlet(className, ae, fragment);
+        } catch (IllegalArgumentException iae) {
+            String[] urlPatterns = null;
+            for (ElementValuePair evp : ae.getElementValuePairs()) {
+                String name = evp.getNameString();
+                if ("value".equals(name) || "urlPatterns".equals(name)) {
+                    urlPatterns = processAnnotationsStringArray(evp.getValue());
+                    break;
+                }
+            }
+
+            if (urlPatterns != null) {
+                for (String pattern : urlPatterns) {
+                    if (fragment.getServletMappings().containsKey(pattern)) {
+                        logger.warning(iae.getMessage(), iae);
+                        return;
+                    }
+                }
+            }
+
+            throw iae;
+        }
+    }
+
     private boolean isIncludedIn(final String filePath, final File classAsFile) throws MalformedURLException {
         final File file = URLs.toFile(new URL(filePath));