mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-20 07:25:23 +02:00
Code Issues Wiki Activity

Bug 314303: Protect against NPE.

Browse source
This commit is contained in:
Marc Khouzam 2010-05-25 17:16:48 +00:00
parent 27f89cdca5
commit 825017ddae
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/CSourceLookup.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2007, 2008 Wind River Systems and others. * Copyright (c) 2007, 2010 Wind River Systems and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -82,13 +82,21 @@ public class CSourceLookup extends AbstractDsfService implements ISourceLookup {
for (int i = 0; i < containers.length; ++i) { for (int i = 0; i < containers.length; ++i) {
if (containers[i] instanceof ProjectSourceContainer) { if (containers[i] instanceof ProjectSourceContainer) {
IProject project = ((ProjectSourceContainer)containers[i]).getProject(); IProject project = ((ProjectSourceContainer)containers[i]).getProject();
if (project != null && project.exists()) if (project != null && project.exists()) {
list.add(project.getLocation().toPortableString()); IPath location = project.getLocation();
if (location != null) {
list.add(location.toPortableString());
}
}
} }
if (containers[i] instanceof FolderSourceContainer) { if (containers[i] instanceof FolderSourceContainer) {
IContainer container = ((FolderSourceContainer)containers[i]).getContainer(); IContainer container = ((FolderSourceContainer)containers[i]).getContainer();
if (container != null && container.exists()) if (container != null && container.exists()) {
list.add(container.getLocation().toPortableString()); IPath location = container.getLocation();
if (location != null) {
list.add(location.toPortableString());
}
}
} }
if (containers[i] instanceof DirectorySourceContainer) { if (containers[i] instanceof DirectorySourceContainer) {
File dir = ((DirectorySourceContainer)containers[i]).getDirectory(); File dir = ((DirectorySourceContainer)containers[i]).getDirectory();