Only abort redeploymebts

1 files changed, 4 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 e8561537bec..3fac3f3e982 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
@@ -170,7 +170,10 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
             throw new IllegalStateException(localSession.logPre() + "Session " + localSession.getSessionId() + " is already active");
 
         if (Session.Status.NEW.equals(localSession.getStatus()))
-            throw new IllegalStateException(localSession.logPre() + "Session " + localSession.getSessionId() + " is not prepared");
+            throw new IllegalStateException(localSession.logPre() + "Session " + localSession.getSessionId() + " is not 
+
+        if ( ! localSession.getMetaData().isInternalRedeploy())
+            return;
 
         if (preparing.isEmpty())
             throw new IllegalStateException("No session is currently being prepared for '" + session.getApplicationId() + "'");