diff options
| author | cbridgha | 2006-06-08 21:24:30 +0000 |
|---|---|---|
| committer | cbridgha | 2006-06-08 21:24:30 +0000 |
| commit | 1d4f0fbc3dc79d4f7de977b25110967b1cf9dd79 (patch) | |
| tree | a4e008620e3b6491cfe6d3733a25ec561e1cb2e2 /plugins | |
| parent | 2d8bca08d846ca9e8d28777a741e912d91ff187c (diff) | |
| download | webtools.javaee-1d4f0fbc3dc79d4f7de977b25110967b1cf9dd79.tar.gz webtools.javaee-1d4f0fbc3dc79d4f7de977b25110967b1cf9dd79.tar.xz webtools.javaee-1d4f0fbc3dc79d4f7de977b25110967b1cf9dd79.zip | |
[146068] Regression in Container
Diffstat (limited to 'plugins')
2 files changed, 12 insertions, 9 deletions
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/FlexibleProjectContainer.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/FlexibleProjectContainer.java index 99ea5ae73..c4fd613da 100644 --- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/FlexibleProjectContainer.java +++ b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/FlexibleProjectContainer.java @@ -294,13 +294,14 @@ public abstract class FlexibleProjectContainer { final IClasspathContainer container = JavaCore.getClasspathContainer( path, jproj ); + if(null != container){ + final IClasspathEntry[] containerEntries + = container.getClasspathEntries(); + + existing.removeAll( Arrays.asList( containerEntries ) ); - final IClasspathEntry[] containerEntries - = container.getClasspathEntries(); - - existing.removeAll( Arrays.asList( containerEntries ) ); - - break; + break; + } } } } diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java index 803d78f16..b0cf978e9 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java @@ -134,9 +134,11 @@ public class J2EEComponentClasspathContainer implements IClasspathContainer { final IPath path = cp[i].getPath(); if (path.equals(CONTAINER_PATH)) { final IClasspathContainer container = JavaCore.getClasspathContainer(path, javaProject); - final IClasspathEntry[] containerEntries = container.getClasspathEntries(); - existingEntries.removeAll(Arrays.asList(containerEntries)); - break; + if(null != container){ + final IClasspathEntry[] containerEntries = container.getClasspathEntries(); + existingEntries.removeAll(Arrays.asList(containerEntries)); + break; + } } } existingEntries.removeAll(Arrays.asList(entries)); |