svn commit: r936169 - /sling/trunk/bundles/commons/auth/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java

[fmeschbe]

Author: fmeschbe
Date: Wed Apr 21 06:23:44 2010
New Revision: 936169

URL: http://svn.apache.org/viewvc?rev=936169&view=rev
Log:
SLING-1493 Prevent binding to an authentication handler which cannot be accessed

Modified:
    
sling/trunk/bundles/commons/auth/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java

Modified: 
sling/trunk/bundles/commons/auth/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/auth/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java?rev=936169&r1=936168&r2=936169&view=diff
==============================================================================
--- 
sling/trunk/bundles/commons/auth/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java
 (original)
+++ 
sling/trunk/bundles/commons/auth/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java
 Wed Apr 21 06:23:44 2010
@@ -1325,14 +1325,18 @@ public class SlingAuthenticator implemen
         @Override
         public Object addingService(ServiceReference reference) {
             final Object service = super.addingService(reference);
-            bindAuthHandler(service, reference);
+            if (service != null) {
+                bindAuthHandler(service, reference);
+            }
             return service;
         }
 
         @Override
         public void modifiedService(ServiceReference reference, Object 
service) {
             unbindAuthHandler(reference);
-            bindAuthHandler(service, reference);
+            if (service != null) {
+                bindAuthHandler(service, reference);
+            }
         }
 
         @Override