Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault (Ericsson)2013-02-27 11:07:23 -0500
committerPascal Rapicault2013-02-27 11:07:23 -0500
commit790e216bde5d1d518611396c540216b2fcbac8ec (patch)
treeec1e68b9367bcbf17fff72536aa16a597337508c /bundles/org.eclipse.equinox.p2.ui.sdk.scheduler
parentea7172997438f874cff0116c37648882dfa14616 (diff)
downloadrt.equinox.p2-790e216bde5d1d518611396c540216b2fcbac8ec.tar.gz
rt.equinox.p2-790e216bde5d1d518611396c540216b2fcbac8ec.tar.xz
rt.equinox.p2-790e216bde5d1d518611396c540216b2fcbac8ec.zip
Fix logic to detect previous configuration when matching product id
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.ui.sdk.scheduler')
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/PreviousConfigurationFinder.java9
1 files changed, 5 insertions, 4 deletions
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 8c6091332..9fd244b91 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
@@ -185,10 +185,11 @@ public class PreviousConfigurationFinder {
int numberOfcriteriaMet = 0;
for (ConfigurationDescriptor candidate : configurations) {
int criteriaMet = 0;
- criteriaMet++;
- if (candidate.getProductId().equals(configToMatch.getProductId()) && //
- candidate.getPlatformConfig().equals(configToMatch.getPlatformConfig()) && //
- (!candidate.getVersion().isGreaterEqualTo(configToMatch.getVersion()))) {
+ if (!candidate.getProductId().equals(configToMatch.getProductId()))
+ continue;
+
+ if (candidate.getPlatformConfig().equals(configToMatch.getPlatformConfig()) && //
+ (configToMatch.getVersion().isGreaterEqualTo(candidate.getVersion()))) {
//We have a match
criteriaMet++;
}

Back to the top