Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKent Johnson2004-09-08 12:26:43 -0400
committerKent Johnson2004-09-08 12:26:43 -0400
commit85efc51ff8ff462bf94bf89be9f2a537695ffe4a (patch)
tree5a407b94c59ac626e133946519e2e60cd4dcddba
parent590fe7d28c5d87f0a4803920d9e4cad3b2c4a9d6 (diff)
downloadeclipse.jdt.core-85efc51ff8ff462bf94bf89be9f2a537695ffe4a.tar.gz
eclipse.jdt.core-85efc51ff8ff462bf94bf89be9f2a537695ffe4a.tar.xz
eclipse.jdt.core-85efc51ff8ff462bf94bf89be9f2a537695ffe4a.zip
73330
-rw-r--r--org.eclipse.jdt.core/buildnotes_jdt-core.html16
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/AddJarFileToIndex.java6
2 files changed, 22 insertions, 0 deletions
diff --git a/org.eclipse.jdt.core/buildnotes_jdt-core.html b/org.eclipse.jdt.core/buildnotes_jdt-core.html
index e2447c59bf..02dd002355 100644
--- a/org.eclipse.jdt.core/buildnotes_jdt-core.html
+++ b/org.eclipse.jdt.core/buildnotes_jdt-core.html
@@ -35,6 +35,22 @@
</tr>
</table>
+<a name="v_453"></a>
+<p><hr><h1>
+Eclipse Platform Build Notes&nbsp;<br>
+Java Development Tooling Core</h1>
+Eclipse SDK 3.0.1 Build - ? September 2004 - 3.0.1 RELEASE CANDIDATE 1
+<br>Project org.eclipse.jdt.core v_453_R30x
+(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_453_R30x">cvs</a>).
+<h2>
+What's new in this drop</h2>
+<ul>
+</ul>
+
+<h3>Problem Reports Fixed</h3>
+<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73330">73330</a>
+NullPointerException in search
+
<a name="v_452"></a>
<p><hr><h1>
Eclipse Platform Build Notes&nbsp;<br>
diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/AddJarFileToIndex.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/AddJarFileToIndex.java
index e263d9e611..2878e2b381 100644
--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/AddJarFileToIndex.java
+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/AddJarFileToIndex.java
@@ -158,6 +158,12 @@ class AddJarFileToIndex extends IndexRequest {
// index already existed: recreate it so that we forget about previous entries
SearchParticipant participant = SearchEngine.getDefaultSearchParticipant();
index = manager.recreateIndex(this.containerPath);
+ if (index == null) {
+ // failed to recreate index, see 73330
+ manager.removeIndex(this.containerPath);
+ return false;
+ }
+
for (Enumeration e = zip.entries(); e.hasMoreElements();) {
if (this.isCancelled) {
if (JobManager.VERBOSE)

Back to the top