Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Grunberg2017-02-03 13:30:27 -0500
committerAlexander Kurtakov2017-07-03 13:20:25 -0400
commit92928dfaa2124188bb30149d1bf706a6f5e7f897 (patch)
treeaf98a1e3cb21b00b7bad7d17c24b867053e60fff /bundles/org.eclipse.equinox.p2.engine/src
parentd6c862cc5a2b20d5577e41baf513d01fbf6f80ac (diff)
downloadrt.equinox.p2-92928dfaa2124188bb30149d1bf706a6f5e7f897.tar.gz
rt.equinox.p2-92928dfaa2124188bb30149d1bf706a6f5e7f897.tar.xz
rt.equinox.p2-92928dfaa2124188bb30149d1bf706a6f5e7f897.zip
Bug 512312: Droplets should correctly detect feature group IUs.I20170703-2000
This issue has been mostly addressed by 7c95455. The logic for detection of feature groups was wrongly comparing a string and a boolean for equality as well as being computed more times than necessary. Change-Id: Icd714e39b798fba748d88c3aea2845649aa9fee1 Signed-off-by: Roland Grunberg <rgrunber@redhat.com>
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.engine/src')
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java
index 85162fa9a..877007183 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java
@@ -236,10 +236,11 @@ public class SurrogateProfileHandler implements ISurrogateProfileHandler {
|| "feature".equals(cap.getName())) { //$NON-NLS-1$
featureOrBundle = true;
}
- } else if (Boolean.TRUE.equals(Boolean.valueOf(unit.getProperties().get("org.eclipse.equinox.p2.type.group")))) { //$NON-NLS-1$
- featureOrBundle = true;
}
}
+ if (Boolean.TRUE.equals(Boolean.valueOf(unit.getProperties().get("org.eclipse.equinox.p2.type.group")))) { //$NON-NLS-1$
+ featureOrBundle = true;
+ }
if (featureOrBundle && !added.contains(unit)) {
added.add(unit);
sharedProfile.addInstallableUnit(unit);

Back to the top