From 8f0bc15dea0bf124b1f56e7da8a64de010c7e285 Mon Sep 17 00:00:00 2001
From: Pascal Rapicault
Date: Wed, 13 Mar 2013 22:08:51 -0400
Subject: deal with legacy configuration folders

---
 .../p2/ui/sdk/scheduler/PreviousConfigurationFinder.java     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'bundles/org.eclipse.equinox.p2.ui.sdk.scheduler')

diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/PreviousConfigurationFinder.java b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/PreviousConfigurationFinder.java
index 09ae0f104..4010af2b9 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/PreviousConfigurationFinder.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/PreviousConfigurationFinder.java
@@ -172,8 +172,8 @@ public class PreviousConfigurationFinder {
 			}
 			criteriaMet++;
 
-			if (candidate.getProductId().equals(configToMatch.getProductId()) && //
-					candidate.getPlatformConfig().equals(configToMatch.getPlatformConfig()) && //
+			if (configToMatch.getProductId().equals(candidate.getProductId()) && //
+					configToMatch.getPlatformConfig().equals(candidate.getPlatformConfig()) && //
 					(!candidate.getVersion().isGreaterEqualTo(configToMatch.getVersion()))) {
 				//We have a match
 				criteriaMet++;
@@ -203,11 +203,13 @@ public class PreviousConfigurationFinder {
 		int numberOfcriteriaMet = 0;
 		for (ConfigurationDescriptor candidate : configurations) {
 			int criteriaMet = 0;
-			if (!candidate.getProductId().equals(configToMatch.getProductId()))
+			if (!configToMatch.getProductId().equals(candidate.getProductId()))
 				continue;
 
-			if (candidate.getPlatformConfig().equals(configToMatch.getPlatformConfig()) && //
-					(configToMatch.getVersion().isGreaterEqualTo(candidate.getVersion()))) {
+			if (configToMatch.getPlatformConfig().equals(candidate.getPlatformConfig()))
+				criteriaMet++;
+
+			if (configToMatch.getVersion().isGreaterEqualTo(candidate.getVersion())) {
 				//We have a match
 				criteriaMet++;
 			}
-- 
cgit v1.2.3