Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2010-02-16 15:11:40 -0500
committerThomas Watson2010-02-16 15:11:40 -0500
commit685dd22f34cd57ea79a27594c12a36bb1856ca7a (patch)
treec63659fc5e0b769dcc550636cce9b0192293002a /bundles/org.eclipse.osgi/resolver
parent1fac03c5368a21c96bfda9f288ac7033a85ff8ef (diff)
downloadrt.equinox.framework-685dd22f34cd57ea79a27594c12a36bb1856ca7a.tar.gz
rt.equinox.framework-685dd22f34cd57ea79a27594c12a36bb1856ca7a.tar.xz
rt.equinox.framework-685dd22f34cd57ea79a27594c12a36bb1856ca7a.zip
Bug 302601 - NPE in GroupingChecker
Diffstat (limited to 'bundles/org.eclipse.osgi/resolver')
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/GroupingChecker.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/GroupingChecker.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/GroupingChecker.java
index a0522d09f..79f9e59dc 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/GroupingChecker.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/GroupingChecker.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2004, 2010 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -159,7 +159,7 @@ public class GroupingChecker {
if (supplier.getExport(packageName) != null) {
// the required bundle exports the package; get the package roots from it
PackageRoots requiredRoots = getPackageRoots(supplier, packageName, visited);
- if (requiredRoots != null)
+ if (requiredRoots != nullPackageRoots)
roots.add(requiredRoots);
} else {
// the bundle does not export the package; but it may reexport another bundle that does
@@ -171,7 +171,7 @@ public class GroupingChecker {
if (reexported.getExport(packageName) != null) {
// the reexported bundle exports the package; get the package roots from it
PackageRoots reExportedRoots = getPackageRoots(reexported, packageName, visited);
- if (reexported != null)
+ if (reExportedRoots != nullPackageRoots)
roots.add(reExportedRoots);
}
}

Back to the top