svn commit: r1731760 - /sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTracker.java

[sseifert]

Author: sseifert
Date: Tue Feb 23 00:02:24 2016
New Revision: 1731760

URL: http://svn.apache.org/viewvc?rev=1731760&view=rev
Log:
SLING-5545 Potential NPE in ResourceProviderTracker.postEvents during shutdown

Modified:
    
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTracker.java

Modified: 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTracker.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTracker.java?rev=1731760&r1=1731759&r2=1731760&view=diff
==============================================================================
--- 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTracker.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTracker.java
 Tue Feb 23 00:02:24 2016
@@ -406,7 +406,7 @@ public class ResourceProviderTracker imp
                 for(final ProviderEvent e : events) {
                     postOSGiEvent(e);
                     postResourceProviderChange(e);
-                    if ( e.pid != null ) {
+                    if ( e.pid != null && listener != null ) {
                         listener.providerChanged(e.pid);
                     }
                 }