commit d7c44980371fa36a34227ec0d157984604ae328f
author Steve Loughran <stevel@apache.org> Mon Dec 14 18:24:15 2015 +0000
committer Steve Loughran <stevel@apache.org> Mon Dec 14 18:24:15 2015 +0000
tree f05e18a157bb0a783566ea27891ab9b3f86cc831
parent a2619c8518c3de34431af53324d7c1730253d2fe
parent 9cb9661252ac90428a7943c495fa4af04bde4491

Merge branch 'develop' into feature/SLIDER-1022-HTTPS

slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java

diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
index f339f6a..8932267 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
@@ -635,16 +635,18 @@
     Configuration serviceConf = getConfig();
 
     // extend AM configuration with component resource
-    MapOperations amConfiguration = getInstanceDefinition()
+    MapOperations amConfiguration = resolvedInstance
       .getAppConfOperations().getComponent(COMPONENT_AM);
     // and patch configuration with prefix
-    Map<String, String> sliderAppConfKeys = amConfiguration.prefixedWith("slider.");
-    for (Map.Entry<String, String> entry : sliderAppConfKeys.entrySet()) {
-      String k = entry.getKey();
-      String v = entry.getValue();
-      boolean exists = serviceConf.get(k) != null;
-      log.info("{} {} to {}", (exists ? "Overwriting" : "Setting"), k, v);
-      serviceConf.set(k, v);
+    if (amConfiguration != null) {
+      Map<String, String> sliderAppConfKeys = amConfiguration.prefixedWith("slider.");
+      for (Map.Entry<String, String> entry : sliderAppConfKeys.entrySet()) {
+        String k = entry.getKey();
+        String v = entry.getValue();
+        boolean exists = serviceConf.get(k) != null;
+        log.info("{} {} to {}", (exists ? "Overwriting" : "Setting"), k, v);
+        serviceConf.set(k, v);
+      }
     }
 
     securityConfiguration = new SecurityConfiguration(serviceConf, resolvedInstance, clustername);