[FIXED JENKINS-20166] Promoted Build NullPointer when not manual prom…

…otion
jenkinsci · Oct 27, 2013 · cb976b9 · cb976b9
1 parent bfe2f06
commit cb976b9
Showing 1 changed file with 21 additions and 19 deletions.
diff --git a/src/main/java/hudson/plugins/promoted_builds/Promotion.java b/src/main/java/hudson/plugins/promoted_builds/Promotion.java
@@ -134,25 +134,27 @@ public String getUserName(){
     }
 
     public List<ParameterValue> getParameterValues(){
-    	List<ParameterValue> values=new ArrayList<ParameterValue>(); 
-    	ParametersAction parametersAction=getParametersActions(this);
-    	if (parametersAction!=null){
-    		ManualCondition manualCondition=(ManualCondition) getProject().getPromotionCondition(ManualCondition.class.getName());
-    		for (ParameterValue pvalue:parametersAction.getParameters()){
-    			if (manualCondition.getParameterDefinition(pvalue.getName())!=null){
-    				values.add(pvalue);
-    			}
-    		}
-    		return values;
-    	}
-
-    	//fallback to badge lookup for compatibility 
-    	for (PromotionBadge badget:getStatus().getBadges()){
-    		if (badget instanceof ManualCondition.Badge){
-    			return ((ManualCondition.Badge) badget).getParameterValues();
-    		}
-    	}
-    	return Collections.emptyList();
+      List<ParameterValue> values=new ArrayList<ParameterValue>(); 
+      ParametersAction parametersAction=getParametersActions(this);
+      if (parametersAction!=null){
+        ManualCondition manualCondition=(ManualCondition) getProject().getPromotionCondition(ManualCondition.class.getName());
+        if (manualCondition!=null){
+          for (ParameterValue pvalue:parametersAction.getParameters()){
+            if (manualCondition.getParameterDefinition(pvalue.getName())!=null){
+              values.add(pvalue);
+            }
+          }
+        }
+        return values;
+      }
+
+      //fallback to badge lookup for compatibility 
+      for (PromotionBadge badget:getStatus().getBadges()){
+        if (badget instanceof ManualCondition.Badge){
+          return ((ManualCondition.Badge) badget).getParameterValues();
+        }
+      }
+      return Collections.emptyList();
     }
 
     public List<ParameterDefinition> getParameterDefinitionsWithValue(){