Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2006-04-26 22:49:43 +0000
committerPascal Rapicault2006-04-26 22:49:43 +0000
commit2db33b6348cb2ee446f0a63251695e26834750bf (patch)
tree759d0ec8f42e3d1d86b2155c58747c75a579804d
parentb0369189845b0c7a84500075f75d771c9ef3ee16 (diff)
downloadeclipse.pde.build-2db33b6348cb2ee446f0a63251695e26834750bf.tar.gz
eclipse.pde.build-2db33b6348cb2ee446f0a63251695e26834750bf.tar.xz
eclipse.pde.build-2db33b6348cb2ee446f0a63251695e26834750bf.zip
Bug 138663 - eclipse.buildScript problems with multiple librariesv20060426
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ClasspathComputer3_0.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ClasspathComputer3_0.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ClasspathComputer3_0.java
index a3253701..3f9c58a9 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ClasspathComputer3_0.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ClasspathComputer3_0.java
@@ -274,14 +274,12 @@ public class ClasspathComputer3_0 implements IClasspathComputer, IPDEBuildConsta
// basePath : the relative path between the plugin from which we are adding the classpath and the plugin that is requiring this entry
// classpath : The classpath in which we want to add this path
private void addPathAndCheck(BundleDescription model, IPath basePath, String libraryName, Properties modelProperties, List classpath) {
- String pluginId = null;
+ String pluginId = model != null ? model.getSymbolicName() : null;
String rules = ""; //$NON-NLS-1$
//only add access rules to libraries that are not part of the current bundle
//and are not this bundle's host if we are a fragment
BundleDescription currentBundle = generator.getModel();
if (model != null && model != currentBundle && (currentBundle.getHost() == null || currentBundle.getHost().getSupplier() != model) ) {
- pluginId = model.getSymbolicName();
-
String packageKey = pluginId;
if (model.isResolved() && model.getHost() != null) {
packageKey = ((BundleDescription) model.getHost().getSupplier()).getSymbolicName();

Back to the top