svn commit: r647590 - /cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/spring/ServletFactoryBean.java

[gk...@apache.org]

Author: gkossakowski
Date: Sun Apr 13 10:13:54 2008
New Revision: 647590

URL: http://svn.apache.org/viewvc?rev=647590&view=rev
Log:
Return Servlet.class instead of null if precise information is not yet available.
This change avoids unnecessary bean creations for BeanMap functionality that scans whole Container for beans of certain type.

Modified:
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/spring/ServletFactoryBean.java

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/spring/ServletFactoryBean.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/spring/ServletFactoryBean.java?rev=647590&r1=647589&r2=647590&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/spring/ServletFactoryBean.java (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/spring/ServletFactoryBean.java Sun Apr 13 10:13:54 2008
@@ -211,7 +211,9 @@
 
     public Class getObjectType() {
         if (this.embeddedServlet == null) {
-            return null;
+            //if embeddedServlet is null we don't know exactly what ObjectType this Factory will return but at least
+            //we are sure it is a class implementing Servlet interface so it's better to return it instead of null
+            return Servlet.class;
         }
 
         return this.embeddedServlet != null ? this.embeddedServlet.getClass() : null;