You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2015/09/22 18:20:42 UTC

svn commit: r1704664 - /sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventSender.java

Author: stefanegli
Date: Tue Sep 22 16:20:39 2015
New Revision: 1704664

URL: http://svn.apache.org/viewvc?rev=1704664&view=rev
Log:
SLING-5052 : avoid NPE when resource no longer exists

Modified:
    sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventSender.java

Modified: sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventSender.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventSender.java?rev=1704664&r1=1704663&r2=1704664&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventSender.java (original)
+++ sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventSender.java Tue Sep 22 16:20:39 2015
@@ -192,7 +192,9 @@ public class DistributedEventSender
                 try {
                     resolver = this.resourceResolverFactory.getAdministrativeResourceResolver(null);
                     final Resource eventResource = resolver.getResource(path);
-                    if ( DistributedEventAdminImpl.RESOURCE_TYPE_EVENT.equals(eventResource.getResourceType())) {
+                    if (eventResource == null) {
+                        this.logger.warn("runInBackground : resource not found at "+path);
+                    } else if ( DistributedEventAdminImpl.RESOURCE_TYPE_EVENT.equals(eventResource.getResourceType())) {
                         final Event e = this.readEvent(eventResource);
                         if ( e != null ) {
                             // we check event admin as processing is async