diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2019-09-04 09:08:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-04 09:08:36 +0200 |
| commit | 167b02afe8a20dfa90ccf2634a7f4fb1d7270011 (patch) | |
| tree | fb589c7d77651bb07437d29a7110bca6dda209cd | |
| parent | 3b7c83a4ef065684210260a1fcb65c0a09585def (diff) | |
| parent | 3d9a69019326a0544933c32edd0c20886511b509 (diff) | |
Merge pull request #10505 from vespa-engine/jvenstad/check-for-nullity
Check for nullity of evil JSON object
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index 2e77aa0c69c..ee5d0a9cd9c 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -226,7 +226,8 @@ public class InternalStepRunner implements StepRunner { logger.log("Restarting services on host " + hostname.id() + "."); }); logger.log("Deployment successful."); - logger.log(prepareResponse.message); + if (prepareResponse.message != null) + logger.log(prepareResponse.message); return Optional.of(running); } catch (ConfigServerException e) { |