Reset triggers while removing cascading project parent

Signed-off-by: Winston Prakash <winston.prakash@gmail.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/hudson-core/src/main/java/hudson/model/Job.java b/hudson-core/src/main/java/hudson/model/Job.java
index 849bf1f..51e9e1c 100644
--- a/hudson-core/src/main/java/hudson/model/Job.java
+++ b/hudson-core/src/main/java/hudson/model/Job.java
@@ -89,6 +89,7 @@ import net.sf.json.JSONObject;
 import org.eclipse.hudson.api.model.IJob;
 import org.eclipse.hudson.api.model.IProjectProperty;
 import org.eclipse.hudson.api.model.project.property.ExternalProjectProperty;
+import org.eclipse.hudson.api.model.project.property.TriggerProjectProperty;
 import org.jvnet.localizer.Localizable;
 import org.kohsuke.args4j.Argument;
 import org.kohsuke.args4j.CmdLineException;
@@ -1616,6 +1617,10 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
         this.cascadingProject = null;
         this.cascadingProjectName = null;
         for (IProjectProperty property : jobProperties.values()) {
+            if (property instanceof TriggerProjectProperty && !property.isOverridden() && property.getValue() != null) {
+                ((TriggerProjectProperty) property).getValue().stop();
+                property.resetValue();
+            }
             property.setOverridden(false);
         }
     }