Patch for Thomas Fletcher: fix for Bug 52238 (NPE in UpdateDependancy). This patch makes sure that a resource has a location before it used in a dependency query.

4 files changed, 24 insertions, 1 deletions

diff --git a/core/org.eclipse.cdt.core.tests/ChangeLog b/core/org.eclipse.cdt.core.tests/ChangeLog
index 4b4c9541a71..8513b756877 100644
--- a/core/org.eclipse.cdt.core.tests/ChangeLog
+++ b/core/org.eclipse.cdt.core.tests/ChangeLog
@@ -1,3 +1,6 @@
+2004-02-17 Bogdan Gheorghe

+	-Added DependencyTests::testDependencyUpdateNPE from Thomas

+	

 2004-02-13 Bogdan Gheorghe

     -Modified CompletionProposalsTest to reset the indexer thread at the

      beginning of the test case - this means that the project will be indexed

diff --git a/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java b/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java
index cbeb4e215eb..3ecfff3e4ba 100644
--- a/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java
+++ b/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java
@@ -32,7 +32,9 @@ import org.eclipse.cdt.internal.core.search.PathCollector;
 import org.eclipse.cdt.internal.core.search.PatternSearchJob;
 import org.eclipse.cdt.internal.core.search.indexing.IndexManager;
 import org.eclipse.cdt.internal.core.search.matching.CSearchPattern;
+import org.eclipse.cdt.internal.core.search.processing.IJob;
 import org.eclipse.cdt.internal.core.sourcedependency.DependencyQueryJob;
+import org.eclipse.cdt.internal.core.sourcedependency.UpdateDependency;
 import org.eclipse.cdt.internal.ui.search.CSearchResultCollector;
 import org.eclipse.core.internal.resources.ResourceException;
 import org.eclipse.core.resources.IFile;
@@ -73,6 +75,7 @@ import org.eclipse.core.runtime.Platform;
 		suite.addTest(new DependencyTests("testDepHeaderChangeReindex"));
 		suite.addTest(new DependencyTests("testDepSourceChangeTable"));
 		suite.addTest(new DependencyTests("testDepHeaderChangeTable"));
+		suite.addTest(new DependencyTests("testUpdateDependancyNPE"));
 		return suite;
 	}
 	/**
@@ -523,6 +526,16 @@ import org.eclipse.core.runtime.Platform;
    compareArrays(iPath,beforeModel);
    
  }
+ 
+ public void testUpdateDependancyNPE() {
+ 	IResource nonExistantResource = ResourcesPlugin.getWorkspace().getRoot().getProject("non-existant-project-aha");
+ 	
+ 	assertFalse(nonExistantResource.exists());
+ 	assertNull(nonExistantResource.getLocation());
+ 	
+ 	IJob job = new UpdateDependency(nonExistantResource);
+ 	assertFalse(job.execute(new NullProgressMonitor()));
+ }
   
 
  public void testDepHeaderChangeReindex() throws Exception{
diff --git a/core/org.eclipse.cdt.core/dependency/ChangeLog b/core/org.eclipse.cdt.core/dependency/ChangeLog
index fc524c19ee5..ad372ab13cc 100644
--- a/core/org.eclipse.cdt.core/dependency/ChangeLog
+++ b/core/org.eclipse.cdt.core/dependency/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-17 Bogdan Gheorghe

+	- Fix for Bug 52238 from Thomas Fletcher: Check to see if you can

+	  get a location off the resource before attempting to use it

+	  

 2003-11-10 Bogdan Gheorghe

 	- Added a null resource check in UpdateDependency to fix up

 	  a potential NPE in the test suite

diff --git a/core/org.eclipse.cdt.core/dependency/org/eclipse/cdt/internal/core/sourcedependency/UpdateDependency.java b/core/org.eclipse.cdt.core/dependency/org/eclipse/cdt/internal/core/sourcedependency/UpdateDependency.java
index d3cc5995898..fd66bda8bf9 100644
--- a/core/org.eclipse.cdt.core/dependency/org/eclipse/cdt/internal/core/sourcedependency/UpdateDependency.java
+++ b/core/org.eclipse.cdt.core/dependency/org/eclipse/cdt/internal/core/sourcedependency/UpdateDependency.java
@@ -60,11 +60,14 @@ public class UpdateDependency implements IJob {
 	 */
 	public boolean execute(IProgressMonitor progress) {	
 		if (resource == null) return false;	
+		
+		IPath location = resource.getLocation();
+		if (location == null) return false;
 		  
 		PathCollector pathCollector = new PathCollector();
 			//SubProgressMonitor subMonitor = (progressMonitor == null ) ? null : new SubProgressMonitor( progressMonitor, 5 );
 			ICSearchScope scope = SearchEngine.createWorkspaceScope();
-			CSearchPattern pattern = CSearchPattern.createPattern(resource.getLocation().toOSString(),ICSearchConstants.INCLUDE, ICSearchConstants.REFERENCES,ICSearchConstants.EXACT_MATCH,true);
+			CSearchPattern pattern = CSearchPattern.createPattern(location.toOSString(),ICSearchConstants.INCLUDE, ICSearchConstants.REFERENCES,ICSearchConstants.EXACT_MATCH,true);
 			IndexManager indexManager = CCorePlugin.getDefault().getCoreModel().getIndexManager();
 			indexManager.performConcurrentJob( 
 				new PatternSearchJob(