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/03 15:23:32 UTC

svn commit: r1428359 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java

Author: rmannibucau
Date: Thu Jan  3 14:23:32 2013
New Revision: 1428359

URL: http://svn.apache.org/viewvc?rev=1428359&view=rev
Log:
TOMEE-692 skipping jsp when looking for injectable servlets

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1428359&r1=1428358&r2=1428359&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Thu Jan  3 14:23:32 2013
@@ -1826,7 +1826,7 @@ public class AnnotationDeployer implemen
                     servletClass = realClassName(servlet.getServletName());
                 }
 
-                if (servletClass != null) {
+                if (servletClass != null && servlet.getJspFile() == null) { // jaxrs application doesn't have a jsp file
                     if (!"org.apache.openejb.server.rest.OpenEJBRestServlet".equals(servletClass)) {
                         try {
                             Class clazz = classLoader.loadClass(servletClass);