[JENKINS-47972] fix ClaimConfig circular dependency on data migration

jenkinsci · Dec 24, 2017 · 5bf7f4d · 5bf7f4d
1 parent 48e857d
commit 5bf7f4d
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/claim/ClaimConfig.java b/src/main/java/hudson/plugins/claim/ClaimConfig.java
@@ -133,7 +133,16 @@ public SecureGroovyScript getGroovyTrigger() {
     }
 
     void setGroovyTrigger(@Nonnull SecureGroovyScript groovyTrigger) {
-        this.groovyTrigger = groovyTrigger.configuring(ApprovalContext.create().withCurrentUser().withKey(GROOVY_SCRIPT_KEY));    }
+        this.setGroovyTrigger(groovyTrigger, true);
+    }
+
+    private void setGroovyTrigger(@Nonnull SecureGroovyScript groovyTrigger, boolean withCurrentUser ) {
+        ApprovalContext approvalContext = ApprovalContext.create().withKey(GROOVY_SCRIPT_KEY);
+        if (withCurrentUser) {
+            approvalContext = approvalContext.withCurrentUser();
+        }
+        this.groovyTrigger = groovyTrigger.configuring(approvalContext);
+    }
 
     public boolean hasGroovyTrigger() {
         return StringUtils.isNotEmpty(groovyTrigger.getScript());
@@ -150,7 +159,7 @@ public static ClaimConfig get() {
     @SuppressWarnings("deprecation")
     private Object readResolve() {
         // JENKINS-43811 migration logic
-        setGroovyTrigger(new SecureGroovyScript(groovyScript != null ? groovyScript : "", true, null));        return this;
+        setGroovyTrigger(new SecureGroovyScript(groovyScript != null ? groovyScript : "", true, null), false);        return this;
     }
 
 }