[fixed JENKINS-16620] A better solution

jenkinsci · Feb 5, 2013 · d0a6112 · d0a6112
1 parent 8ade146
commit d0a6112
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/src/main/java/net/praqma/hudson/scm/CCUCMScm.java b/src/main/java/net/praqma/hudson/scm/CCUCMScm.java
@@ -401,19 +401,12 @@ private void resolveBaseline( FilePath workspace, AbstractProject<?, ?> project,
 
         List<Baseline> baselines = null;
 
-        CCUCMBuildAction lastAction = getLastAction( project );
+        /* We need to discriminate on promotion level, JENKINS-16620 */
         Date date = null;
-        if( lastAction != null ) {
-            AbstractBuild lastBuild = lastAction.getBuild();
-            if( lastBuild.getResult().isBetterThan( Result.FAILURE ) ) {
+        if( plevel == null ) {
+            CCUCMBuildAction lastAction = getLastAction( project );
+            if( lastAction != null ) {
                 date = lastAction.getBaseline().getDate();
-            } else {
-                /* We need to include the last baseline as well, see JENKINS-16620 */
-                date = lastAction.getBaseline().getDate();
-                Calendar cal = Calendar.getInstance();
-                cal.setTime( date );
-                cal.add( Calendar.MINUTE, -1 );
-                date = cal.getTime();
             }
         }