mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-13 11:15:38 +02:00
Code Issues Wiki Activity

Bug 103784: NPE in source lookup.

Browse source
This commit is contained in:
Mikhail Khodjaiants 2005-07-14 15:32:35 +00:00
parent 5d8ec23f02
commit 519a3f133b
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
debug/org.eclipse.cdt.debug.core/ChangeLog
View file

@ -1,3 +1,7 @@
2005-07-14 Mikhail Khodjaiants
Bug 103784: NPE in source lookup.
* CSourceLookupDirector.java
2005-07-11 Mikhail Khodjaiants
Bug 94770: Breakpoint marker messages need formatting.
* BreakpointMessages.properties

4
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLookupDirector.java
View file

@ -106,7 +106,7 @@ public class CSourceLookupDirector extends AbstractSourceLookupDirector {
if ( container instanceof ProjectSourceContainer ) {
IProject project = ((ProjectSourceContainer)container).getProject();
IPath projPath = project.getLocation();
if ( projPath.isPrefixOf( path ) ) {
if ( projPath != null && projPath.isPrefixOf( path ) ) {
IFile file = ((ProjectSourceContainer)container).getProject().getFile( path.removeFirstSegments( projPath.segmentCount() ) );
return ( file != null && file.exists() );
}
@ -114,7 +114,7 @@ public class CSourceLookupDirector extends AbstractSourceLookupDirector {
if ( container instanceof FolderSourceContainer ) {
IContainer folder = ((FolderSourceContainer)container).getContainer();
IPath folderPath = folder.getLocation();
if ( folderPath.isPrefixOf( path ) ) {
if ( folderPath != null && folderPath.isPrefixOf( path ) ) {
IFile file = ((FolderSourceContainer)container).getContainer().getFile( path.removeFirstSegments( folderPath.segmentCount() ) );
return ( file != null && file.exists() );
}