commit 14945f4a601823d5b483d84386af890fd3174765
author Ning Wang <nwang@twitter.com> Wed Nov 29 15:00:37 2017 -0800
committer Ning Wang <nwang@twitter.com> Wed Nov 29 15:25:02 2017 -0800
tree 3d6908cc45bcd529ea3e3e53384716dee0479570
parent 649a005f689693f3376b251584f2a8aef1928d2b

Add null protection in config translation code (#2597)

This change contains only null pointer checks. check job hasn't finished yet but it has been running for awhile so compiling should be successful now.

storm-compatibility/src/java/backtype/storm/utils/ConfigUtils.java

diff --git a/storm-compatibility/src/java/backtype/storm/utils/ConfigUtils.java b/storm-compatibility/src/java/backtype/storm/utils/ConfigUtils.java
index 18e25de..965e56b 100644
--- a/storm-compatibility/src/java/backtype/storm/utils/ConfigUtils.java
+++ b/storm-compatibility/src/java/backtype/storm/utils/ConfigUtils.java
@@ -38,7 +38,12 @@
    */
   @SuppressWarnings({"rawtypes", "unchecked"})
   public static Config translateConfig(Map stormConfig) {
-    Config heronConfig = new Config((Map<String, Object>) stormConfig);
+    Config heronConfig;
+    if (stormConfig != null) {
+      heronConfig = new Config((Map<String, Object>) stormConfig);
+    } else {
+      heronConfig = new Config();
+    }
 
     // Look at serialization stuff first
     doSerializationTranslation(heronConfig);
@@ -60,7 +65,12 @@
    */
   @SuppressWarnings({"rawtypes", "unchecked"})
   public static Config translateComponentConfig(Map stormConfig) {
-    Config heronConfig = new Config((Map<String, Object>) stormConfig);
+    Config heronConfig;
+    if (stormConfig != null) {
+      heronConfig = new Config((Map<String, Object>) stormConfig);
+    } else {
+      heronConfig = new Config();
+    }
 
     doStormTranslation(heronConfig);
 

storm-compatibility/src/java/org/apache/storm/utils/ConfigUtils.java

diff --git a/storm-compatibility/src/java/org/apache/storm/utils/ConfigUtils.java b/storm-compatibility/src/java/org/apache/storm/utils/ConfigUtils.java
index d7b23a2..614d43f 100644
--- a/storm-compatibility/src/java/org/apache/storm/utils/ConfigUtils.java
+++ b/storm-compatibility/src/java/org/apache/storm/utils/ConfigUtils.java
@@ -38,7 +38,13 @@
    */
   @SuppressWarnings({"rawtypes", "unchecked"})
   public static Config translateConfig(Map stormConfig) {
-    Config heronConfig = new Config((Map<String, Object>) stormConfig);
+    Config heronConfig;
+    if (stormConfig != null) {
+      heronConfig = new Config((Map<String, Object>) stormConfig);
+    } else {
+      heronConfig = new Config();
+    }
+
     // Look at serialization stuff first
     doSerializationTranslation(heronConfig);
 
@@ -59,7 +65,12 @@
    */
   @SuppressWarnings({"rawtypes", "unchecked"})
   public static Config translateComponentConfig(Map stormConfig) {
-    Config heronConfig = new Config((Map<String, Object>) stormConfig);
+    Config heronConfig;
+    if (stormConfig != null) {
+      heronConfig = new Config((Map<String, Object>) stormConfig);
+    } else {
+      heronConfig = new Config();
+    }
 
     doStormTranslation(heronConfig);