Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Keppler2018-07-03 01:31:46 -0400
committerAndrey Loskutov2018-11-03 04:29:32 -0400
commitc842f0afec8d423f3b9e4e8dcd71371ad3b483ea (patch)
tree8c1ab5084fea344870e6b7b67c6494c45fb6933b
parent136932646392e68535fd158c0ce889b21bf7981e (diff)
downloadrt.equinox.p2-c842f0afec8d423f3b9e4e8dcd71371ad3b483ea.tar.gz
rt.equinox.p2-c842f0afec8d423f3b9e4e8dcd71371ad3b483ea.tar.xz
rt.equinox.p2-c842f0afec8d423f3b9e4e8dcd71371ad3b483ea.zip
Bug 535511 - Stackoverflow in installation details dialogI20181105-1800I20181104-1800I20181103-1800
Avoid endless recursion by detecting the parent object being this object. Also increment the plugin versions as necessary. Change-Id: I7e1e7e69d7a01e0b089fd4d56a028d7415eb6f07 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/InstalledIUElement.java4
3 files changed, 5 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
index 26ad7f42d..8af540bd4 100644
--- a/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.equinox.p2.ui;singleton:=true
-Bundle-Version: 2.5.300.qualifier
+Bundle-Version: 2.5.400.qualifier
Bundle-Activator: org.eclipse.equinox.internal.p2.ui.ProvUIActivator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.p2.ui/pom.xml b/bundles/org.eclipse.equinox.p2.ui/pom.xml
index bb98197c1..f771b9883 100644
--- a/bundles/org.eclipse.equinox.p2.ui/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.ui</artifactId>
- <version>2.5.300-SNAPSHOT</version>
+ <version>2.5.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/InstalledIUElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/InstalledIUElement.java
index a44e94cc2..01db29213 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/InstalledIUElement.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/InstalledIUElement.java
@@ -133,7 +133,9 @@ public class InstalledIUElement extends QueriedElement implements IIUElement {
Object parent = getParent(this);
Object objParent = ((InstalledIUElement) obj).getParent(obj);
- if (parent != null && objParent != null)
+ if (parent == this)
+ return objParent == obj;
+ else if (parent != null && objParent != null)
return parent.equals(objParent);
else if (parent == null && objParent == null)
return true;

Back to the top