Use a more specific error code

2 files changed, 3 insertions, 3 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpErrorResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpErrorResponse.java
index 7a86357cd95..81806a0afe7 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpErrorResponse.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpErrorResponse.java
@@ -35,7 +35,7 @@ public class HttpErrorResponse extends HttpResponse {
     public enum errorCodes {
         APPLICATION_LOCK_FAILURE,
         BAD_REQUEST,
-        ACTIVATION_FAILED,
+        ACTIVATION_CONFLICT,
         INTERNAL_SERVER_ERROR,
         INVALID_APPLICATION_PACKAGE,
         METHOD_NOT_ALLOWED,
@@ -66,7 +66,7 @@ public class HttpErrorResponse extends HttpResponse {
     }
 
     public static HttpErrorResponse conflictWhenActivating(String msg) {
-        return new HttpErrorResponse(CONFLICT, errorCodes.ACTIVATION_FAILED.name(), msg);
+        return new HttpErrorResponse(CONFLICT, errorCodes.ACTIVATION_CONFLICT.name(), msg);
     }
 
     public static HttpErrorResponse methodNotAllowed(String msg) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
index f6108611f73..8644948706b 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
@@ -182,7 +182,7 @@ public class SessionActiveHandlerTest extends SessionHandlerTest {
         Clock clock = Clock.systemUTC();
         activateAndAssertOK(90l, 0l, clock);
         activateAndAssertError(92l, 89l, clock,
-                               Response.Status.CONFLICT, HttpErrorResponse.errorCodes.ACTIVATION_FAILED,
+                               Response.Status.CONFLICT, HttpErrorResponse.errorCodes.ACTIVATION_CONFLICT,
                                "tenant:" + tenant + " app:default:default Cannot activate session 92 because the currently active session (90) has changed since session 92 was created (was 89 at creation time)");
     }