Throw ActivationConflictException when unable to acquire activate lock

1 files changed, 1 insertions, 1 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
index c19ae86157a..5005ddf309d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
@@ -126,7 +126,7 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
             log.log(LogLevel.DEBUG, "Trying to acquire lock " + activateLock + " for session " + sessionId);
             boolean acquired = activateLock.acquire(timeoutBudget, ignoreLockFailure);
             if ( ! acquired) {
-                throw new InternalServerException("Did not get activate lock for session " + sessionId + " within " + timeout);
+                throw new ActivationConflictException("Did not get activate lock for session " + sessionId + " within " + timeout);
             }
 
             log.log(LogLevel.DEBUG, "Lock acquired " + activateLock + " for session " + sessionId);