summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-01-29 10:05:16 +0100
committerJon Bratseth <bratseth@oath.com>2018-01-29 10:05:16 +0100
commit3dc07725bd350e6d7e7cc84265b962e3faa5a0f2 (patch)
tree7138fa0fc5026d496f11d1959215398c0e4ecceb
parent4960b4aa3628d9430ffba24e238d1b2063f4a950 (diff)
Make Change.empty final
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java2
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java
index ff8d817ca52..d5ce613b98d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java
@@ -74,7 +74,7 @@ public class Application {
Objects.requireNonNull(validationOverrides, "validationOverrides cannot be null");
Objects.requireNonNull(deployments, "deployments cannot be null");
Objects.requireNonNull(deploymentJobs, "deploymentJobs cannot be null");
- Objects.requireNonNull(change, "deploying cannot be null");
+ Objects.requireNonNull(change, "change cannot be null");
Objects.requireNonNull(metrics, "metrics cannot be null");
Objects.requireNonNull(rotation, "rotation cannot be null");
this.id = id;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java
index 7c1049da587..13d66c8d083 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java
@@ -20,7 +20,7 @@ import java.util.Optional;
*/
public final class Change {
- private static Change empty = new Change(Optional.empty(), Optional.empty());
+ private static final Change empty = new Change(Optional.empty(), Optional.empty());
/** The platform version we are upgrading to, or empty if none */
private final Optional<Version> platform;