azkaban-aplcache

fix property override message due to NPE (#1072) Today there

5/10/2017 2:56:51 PM

Details

diff --git a/azkaban-common/src/main/java/azkaban/utils/PropsUtils.java b/azkaban-common/src/main/java/azkaban/utils/PropsUtils.java
index 9d5171b..3407dab 100644
--- a/azkaban-common/src/main/java/azkaban/utils/PropsUtils.java
+++ b/azkaban-common/src/main/java/azkaban/utils/PropsUtils.java
@@ -378,6 +378,15 @@ public class PropsUtils {
 
     StringBuilder builder = new StringBuilder("");
 
+    // oldProps can not be null during the below comparison process.
+    if (oldProps == null) {
+      oldProps = new Props();
+    }
+
+    if (newProps == null) {
+      newProps = new Props();
+    }
+
     MapDifference<String, String> md =
         Maps.difference(toStringMap(oldProps, false), toStringMap(newProps, false));