[FIXED JENKINS-19017] - FileParameter - Handle non-null file paramete…

…rs as different values The change prevents the issue when Jenkins merges builds with different files coming from one source (It may happen!). Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>
jenkinsci · Sep 28, 2014 · 7c4f6b7 · 7c4f6b7
1 parent b6a15f5
commit 7c4f6b7
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/core/src/main/java/hudson/model/FileParameterValue.java b/core/src/main/java/hudson/model/FileParameterValue.java
@@ -160,7 +160,8 @@ public int hashCode() {
 	}
 
 	/**
-	 * In practice this will always be false, since location should be unique.
+	 * Compares file parameters (existing files will be considered as different).
+	 * Function has been modified in order to avoid <a href="https://issues.jenkins-ci.org/browse/JENKINS-19017">JENKINS-19017</a> issue (wrong merge of builds in the queue).
 	 */
 	@Override
 	public boolean equals(Object obj) {
@@ -171,12 +172,13 @@ public boolean equals(Object obj) {
 		if (getClass() != obj.getClass())
 			return false;
 		FileParameterValue other = (FileParameterValue) obj;
-		if (location == null) {
-			if (other.location != null)
-				return false;
-		} else if (!location.equals(other.location))
-			return false;
-		return true;
+
+		if (location == null && other.location == null) 
+			return true; // Consider null parameters as equal
+
+		//TODO: check fingerprints or checksums to improve the behavior
+		// Return false even if files are equal
+		return false;
 	}
 
     @Override