diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-10-24 15:35:47 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-10-24 15:35:48 -0700 |
| commit | 910a55cea9a2b7317d775d735bcfcf2f30fcf63e (patch) | |
| tree | 876c2793ffd53275b16aa28f62313a5f50e69393 /eclipse/plugins | |
| parent | 650d08173e6401b382a832692f6e18517c73e540 (diff) | |
| parent | ca699a738a30beb12fb384b07fd69f8d12649e5b (diff) | |
| download | sdk-910a55cea9a2b7317d775d735bcfcf2f30fcf63e.zip sdk-910a55cea9a2b7317d775d735bcfcf2f30fcf63e.tar.gz sdk-910a55cea9a2b7317d775d735bcfcf2f30fcf63e.tar.bz2 | |
Merge "Guard against a possible NPE."
Diffstat (limited to 'eclipse/plugins')
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/LibraryClasspathContainerInitializer.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/LibraryClasspathContainerInitializer.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/LibraryClasspathContainerInitializer.java index aa0e736..5b0d185 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/LibraryClasspathContainerInitializer.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/LibraryClasspathContainerInitializer.java @@ -384,7 +384,10 @@ public class LibraryClasspathContainerInitializer extends BaseClasspathContainer for (IResource member : members) { if (member.getType() == IResource.FILE && SdkConstants.EXT_JAR.equalsIgnoreCase(member.getFileExtension())) { - jarFiles.add(member.getLocation().toFile()); + IPath location = member.getLocation(); + if (location != null) { + jarFiles.add(location.toFile()); + } } } } catch (CoreException e) { |