svn commit: r607240 - /incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java

[cziegeler]

Author: cziegeler
Date: Fri Dec 28 05:19:46 2007
New Revision: 607240

URL: http://svn.apache.org/viewvc?rev=607240&view=rev
Log:
The bind methods can be called before activate(). In this case we do lazy 
activation.

Modified:
    
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java

Modified: 
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java?rev=607240&r1=607239&r2=607240&view=diff
==============================================================================
--- 
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
 (original)
+++ 
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
 Fri Dec 28 05:19:46 2007
@@ -342,7 +342,7 @@
     }
 
     protected synchronized void bindServlet(ServiceReference reference) {
-        if (servletContext == null) {
+        if (context == null || servletContext == null) {
             pendingServlets.add(reference);
         } else {
             createServlet(servletContext, reference);
@@ -350,7 +350,7 @@
     }
 
     protected synchronized void unbindServlet(ServiceReference reference) {
-        if (servletContext == null) {
+        if (context == null || servletContext == null) {
             pendingServlets.remove(reference);
         } else {
             destroyServlet(reference);