summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Parker2012-05-12 04:09:03 (EDT)
committerKaloyan Raev2012-05-12 04:09:03 (EDT)
commitfa4f73a67dc11109569f94be5c9ddde5717ab0ff (patch)
tree84231e4b8f51d1459fb06a1c9141155d0e71daa8
parenta636d68d6a53af5ee4aa118cdc887f32a625ceea (diff)
downloadorg.eclipse.libra-fa4f73a67dc11109569f94be5c9ddde5717ab0ff.zip
org.eclipse.libra-fa4f73a67dc11109569f94be5c9ddde5717ab0ff.tar.gz
org.eclipse.libra-fa4f73a67dc11109569f94be5c9ddde5717ab0ff.tar.bz2
[373305] Unhandled event loop exception
When refreshing Bundle Dependency graph in Virgo server editor
-rw-r--r--plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependency.java8
-rw-r--r--plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependencyContentProvider.java4
2 files changed, 9 insertions, 3 deletions
diff --git a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependency.java b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependency.java
index b2c18bf..f746028 100644
--- a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependency.java
+++ b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependency.java
@@ -39,8 +39,12 @@ public abstract class BundleDependency {
@Override
public int hashCode() {
int hashCode = 17;
- hashCode = 31 * hashCode + exportingBundle.hashCode();
- hashCode = 31 * hashCode + importingBundle.hashCode();
+ if (exportingBundle != null) {
+ hashCode = 31 * hashCode + exportingBundle.hashCode();
+ }
+ if (importingBundle != null) {
+ hashCode = 31 * hashCode + importingBundle.hashCode();
+ }
return hashCode;
}
diff --git a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependencyContentProvider.java b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependencyContentProvider.java
index e56709e..f4a8ebc 100644
--- a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependencyContentProvider.java
+++ b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependencyContentProvider.java
@@ -391,7 +391,9 @@ public class BundleDependencyContentProvider implements IGraphContentProvider, I
if (outgoingDependencyDegree >= degree) {
for (IPackageImport pe : bundle.getPackageImports()) {
IBundle dependantBundle = this.bundles.get(Long.valueOf(pe.getSupplierId()));
-
+ if (dependantBundle == null) {
+ continue;
+ }
Set<BundleDependency> bundleDependencies = null;
if (dependenciesByBundle.containsKey(bundle)) {
bundleDependencies = dependenciesByBundle.get(bundle);