You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2015/04/21 18:39:34 UTC

svn commit: r1675154 - /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/impl/DefaultDistributionEventFactory.java

Author: tommaso
Date: Tue Apr 21 16:39:34 2015
New Revision: 1675154

URL: http://svn.apache.org/r1675154
Log:
SLING-4646 - null checks on DefaultDistributionEventFactory

Modified:
    sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/impl/DefaultDistributionEventFactory.java

Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/impl/DefaultDistributionEventFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/impl/DefaultDistributionEventFactory.java?rev=1675154&r1=1675153&r2=1675154&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/impl/DefaultDistributionEventFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/event/impl/DefaultDistributionEventFactory.java Tue Apr 21 16:39:34 2015
@@ -50,13 +50,18 @@ public class DefaultDistributionEventFac
         log.debug("distribution event {} posted", distributionEventTopic);
     }
 
-    public void generatePackageEvent(@Nonnull String distributionEventTopic, DistributionComponentKind kind, @Nonnull String name, @Nonnull DistributionPackageInfo info) {
+    public void generatePackageEvent(@Nonnull String distributionEventTopic, @Nonnull DistributionComponentKind kind,
+                                     @Nonnull String name, @Nonnull DistributionPackageInfo info) {
         try {
             Dictionary<String, Object> dictionary = new Hashtable<String, Object>();
             dictionary.put(DistributionEventProperties.DISTRIBUTION_COMPONENT_NAME, name);
             dictionary.put(DistributionEventProperties.DISTRIBUTION_COMPONENT_KIND, kind.name());
-            dictionary.put(DistributionEventProperties.DISTRIBUTION_TYPE, info.getRequestType());
-            dictionary.put(DistributionEventProperties.DISTRIBUTION_PATHS, info.getPaths());
+            if (info.getRequestType() != null) {
+                dictionary.put(DistributionEventProperties.DISTRIBUTION_TYPE, info.getRequestType());
+            }
+            if (info.getPaths() != null) {
+                dictionary.put(DistributionEventProperties.DISTRIBUTION_PATHS, info.getPaths());
+            }
             generateEvent(distributionEventTopic, dictionary);
 
         } catch (Throwable e) {