Merge pull request #1182 from spotify/dxia/patch1

Improve fix to NPE check
spotify · Nov 15, 2017 · 02f158b · 02f158b
2 parents 00fac7e + f8e168f
commit 02f158b
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/helios-services/src/main/java/com/spotify/helios/master/ZooKeeperMasterModel.java b/helios-services/src/main/java/com/spotify/helios/master/ZooKeeperMasterModel.java
@@ -959,10 +959,11 @@ private RollingUpdateOp rollingUpdateAwaitRunning(final ZooKeeperClient client,
   private boolean isRolloutTimedOut(final ZooKeeperClient client,
                                     final DeploymentGroup deploymentGroup) {
     final String groupName = deploymentGroup.getName();
-    final long groupTimeoutSetting = deploymentGroup.getRolloutOptions() != null
-                                     && deploymentGroup.getRolloutOptions().getTimeout() != null
-                                     ? deploymentGroup.getRolloutOptions().getTimeout()
-                                     : RolloutOptions.getDefault().getTimeout();
+    final RolloutOptions defaultOptions = RolloutOptions.getDefault();
+    final long groupTimeoutSetting =
+        deploymentGroup.getRolloutOptions() == null
+        ? defaultOptions.getTimeout()
+        : deploymentGroup.getRolloutOptions().withFallback(defaultOptions).getTimeout();
     final long secondsSinceDeploy;
     try {
       final String statusPath = Paths.statusDeploymentGroupTasks(groupName);