summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakozak2011-11-22 08:51:07 (EST)
committer Winston Prakash2011-12-01 20:46:58 (EST)
commit626b40f4f1734c1dac3717946acefa61b3e046f2 (patch)
tree7ab1745f9012cd95c232d16407dedb8e179a3426
parentb855a9d245cbe50d8af0b00db50d78cc456ab1eb (diff)
downloadorg.eclipse.hudson.core-626b40f4f1734c1dac3717946acefa61b3e046f2.zip
org.eclipse.hudson.core-626b40f4f1734c1dac3717946acefa61b3e046f2.tar.gz
org.eclipse.hudson.core-626b40f4f1734c1dac3717946acefa61b3e046f2.tar.bz2
Reset legacy properties after conversion to IProperty instance
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
-rw-r--r--hudson-core/src/main/java/hudson/model/AbstractProject.java11
1 files changed, 8 insertions, 3 deletions
diff --git a/hudson-core/src/main/java/hudson/model/AbstractProject.java b/hudson-core/src/main/java/hudson/model/AbstractProject.java
index cc4eaa9..6714fbf 100644
--- a/hudson-core/src/main/java/hudson/model/AbstractProject.java
+++ b/hudson-core/src/main/java/hudson/model/AbstractProject.java
@@ -314,21 +314,27 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
super.buildProjectProperties();
if (null == getProperty(BLOCK_BUILD_WHEN_UPSTREAM_BUILDING_PROPERTY_NAME)) {
setBlockBuildWhenUpstreamBuilding(blockBuildWhenUpstreamBuilding);
+ blockBuildWhenUpstreamBuilding = false;
}
if (null == getProperty(BLOCK_BUILD_WHEN_DOWNSTREAM_BUILDING_PROPERTY_NAME)) {
setBlockBuildWhenDownstreamBuilding(blockBuildWhenDownstreamBuilding);
+ blockBuildWhenDownstreamBuilding = false;
}
if (null == getProperty(CONCURRENT_BUILD_PROPERTY_NAME)) {
setConcurrentBuild(concurrentBuild);
+ concurrentBuild = false;
}
if (null == getProperty(CLEAN_WORKSPACE_REQUIRED_PROPERTY_NAME)) {
setCleanWorkspaceRequired(cleanWorkspaceRequired);
+ cleanWorkspaceRequired = false;
}
if (null == getProperty(QUIET_PERIOD_PROPERTY_NAME)) {
setQuietPeriod(quietPeriod);
+ quietPeriod = null;
}
if (null == getProperty(SCM_CHECKOUT_RETRY_COUNT_PROPERTY_NAME)) {
setScmCheckoutRetryCount(scmCheckoutRetryCount);
+ scmCheckoutRetryCount = null;
}
}
@@ -606,8 +612,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
// ugly name because of EL
public boolean getHasCustomQuietPeriod() {
- return (hasCascadingProject() && getCascadingProject().getHasCustomQuietPeriod())
- || (!hasCascadingProject() && quietPeriod!=null);
+ return null != getIntegerProperty(QUIET_PERIOD_PROPERTY_NAME).getValue();
}
/**
@@ -626,7 +631,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
}
public boolean hasCustomScmCheckoutRetryCount(){
- return scmCheckoutRetryCount != null;
+ return null != getIntegerProperty(SCM_CHECKOUT_RETRY_COUNT_PROPERTY_NAME).getValue();
}
@Override