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

2005-03-18 Alain Magloire

Browse source 
Move more code in the try/finally as a precaution.  Bad things
	where happening (i.e. NPE) but the monitor was not decremented
	* index/org/eclipse/cdt/internal/core/indexing/IndexManager.java
This commit is contained in:
Alain Magloire 2005-03-18 19:06:22 +00:00
parent 6f3bf0d981
commit 1575e7878e
2 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/org.eclipse.cdt.core/index/ChangeLog
View file

@ -1,3 +1,8 @@
2005-03-18 Alain Magloire
Move more code in the try/finally as a precaution. Bad things
where happening (i.e. NPE) but the monitor was not decremented
* index/org/eclipse/cdt/internal/core/indexing/IndexManager.java
2005-03-15 Bogdan Gheorghe 2005-03-15 Bogdan Gheorghe
Added a check for closed projects to update code Added a check for closed projects to update code

49
core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java
View file

@ -415,31 +415,32 @@ public class IndexManager extends JobManager{
//this point //this point
ICDTIndexer indexer = null; ICDTIndexer indexer = null;
indexer = (ICDTIndexer) indexerMap.get(project); indexer = (ICDTIndexer) indexerMap.get(project);
try {
if (indexer == null){ if (indexer == null){
String indexerID = null; String indexerID = null;
try { try {
//Indexer has not been created yet for this session //Indexer has not been created yet for this session
//Check to see if the indexer has been set in a session property //Check to see if the indexer has been set in a session property
indexerID = (String) project.getSessionProperty(indexerIDKey); indexerID = (String) project.getSessionProperty(indexerIDKey);
} catch (CoreException e) {} } catch (CoreException e) {}
//Project was either closed at startup or imported //Project was either closed at startup or imported
if (indexerID == null && if (indexerID == null &&
project.isAccessible()){ project.isAccessible()){
try { try {
indexer=initializeIndexer(project); indexer=initializeIndexer(project);
} catch (CoreException e1) {} } catch (CoreException e1) {}
}
else{
//Create the indexer and store it
indexer = getIndexer(indexerID);
}
//Make sure we're not putting null in map
if (indexer != null)
indexerMap.put(project,indexer);
} }
else{ } finally {
//Create the indexer and store it
indexer = getIndexer(indexerID);
}
//Make sure we're not putting null in map
if (indexer != null)
indexerMap.put(project,indexer);
monitor.exitRead(); monitor.exitRead();
} }