Bug 460929 - Performance tests: Should keep multiple baselines with separate names

1 files changed, 9 insertions, 1 deletions

diff --git a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/DB_Results.java b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/DB_Results.java
index 9ec1c1f..578e5bf 100644
--- a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/DB_Results.java
+++ b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/DB_Results.java
@@ -648,6 +648,7 @@ public static int getDefaultDimensionIndex() {
  * 	<code>null</code> if none was run before it...
  */
 public static String getLastBaselineBuild(String date) {
+    String buildDate = null;
 	if (BUILDS == null) {
 		queryAllVariations("%"); //$NON-NLS-1$
 	}
@@ -661,7 +662,7 @@ public static String getLastBaselineBuild(String date) {
 	for (int i=0; i<BUILDS_LENGTH; i++) {
 		String build = BUILDS[i];
 		if (build.startsWith(DB_VERSION_REF)) {
-			String buildDate = build.substring(build.indexOf('-')+1);
+			buildDate = build.substring(build.lastIndexOf('-')+1);
 			if (buildDate.compareTo(date) < 0) {
 				if (lastBaselineBuild == null || build.compareTo(lastBaselineBuild) > 0) {
 					lastBaselineBuild = build;
@@ -669,6 +670,13 @@ public static String getLastBaselineBuild(String date) {
 			}
 		}
 	}
+	if (DEBUG) {
+	  DEBUG_WRITER.println("\n=== DEBUG getting lastBaselineBuild === ");
+	  DEBUG_WRITER.println("DB_VERSION_REF: " + DB_VERSION_REF);
+	  DEBUG_WRITER.println("buildDate: " + buildDate);
+    DEBUG_WRITER.println("date: " + date);
+    DEBUG_WRITER.println("lastBaselineBuild: " + lastBaselineBuild + "\n");
+	}
 	if (lastBaselineBuild == null && BUILDS.length > 0) {
 		return BUILDS[0];
 	}