usState.getUs() might return null

soabase · Feb 14, 2015 · 8111083 · 8111083
1 parent ab87796
commit 8111083
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...or-core/src/main/java/com/netflix/exhibitor/core/processes/StandardProcessOperations.java b/...or-core/src/main/java/com/netflix/exhibitor/core/processes/StandardProcessOperations.java
@@ -158,7 +158,7 @@ private void prepConfigFile(Details details) throws IOException
             localProperties.setProperty("server." + spec.getServerId(), spec.getHostname() + portSpec + spec.getServerType().getZookeeperConfigValue());
         }
 
-        if ( usState.getUs().getServerType() == ServerType.OBSERVER )
+        if ( (usState.getUs() != null) && (usState.getUs().getServerType() == ServerType.OBSERVER) )
         {
             localProperties.setProperty("peerType", "observer");
         }