From 8de7573809b77ad8cfe193bb61ae272ff84d3d5e Mon Sep 17 00:00:00 2001 From: Florian Schindler Date: Fri, 29 May 2015 08:39:49 +0200 Subject: [PATCH] Fix issue when checking for conflicts in Synergy 7.1 --- .../java/hudson/plugins/synergy/impl/ProjectConflicts.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/hudson/plugins/synergy/impl/ProjectConflicts.java b/src/main/java/hudson/plugins/synergy/impl/ProjectConflicts.java index 6ab6e96..7409282 100644 --- a/src/main/java/hudson/plugins/synergy/impl/ProjectConflicts.java +++ b/src/main/java/hudson/plugins/synergy/impl/ProjectConflicts.java @@ -33,7 +33,12 @@ public void parseResult(String result) { line = line.trim(); if((line.indexOf("Conflict detection completed") == -1) && (line.indexOf("Finding objects that are not included") == -1) && - (line.indexOf("Collecting objects and tasks beyond baseline") == -1)) + (line.indexOf("Collecting objects and tasks beyond baseline") == -1) && + // the following lines are needed using Synergy 7.1; these lines occure sporadically! + (line.indexOf("%...") == -1) && // lines like "0%..." + (line.indexOf("Getting explicitly included objects.") == -1) && + (line.indexOf("Getting members of baseline project.") == -1) && + (line.indexOf("Checking for missing fix tasks.") == -1)) { if (line.length()!=0 && !line.startsWith("Project:") && line.indexOf("No conflicts detected")==-1) {