From c3f79cd9d543e5866196df576186e0ab74965eb0 Mon Sep 17 00:00:00 2001
From: Kent Johnson
Date: Tue, 21 Sep 2004 15:08:50 +0000
Subject: 73330 in 3.0.2 stream

---
 org.eclipse.jdt.core/buildnotes_jdt-core.html                       | 4 +++-
 .../jdt/internal/core/search/indexing/AddJarFileToIndex.java        | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/org.eclipse.jdt.core/buildnotes_jdt-core.html b/org.eclipse.jdt.core/buildnotes_jdt-core.html
index f72c280005..2721acecf7 100644
--- a/org.eclipse.jdt.core/buildnotes_jdt-core.html
+++ b/org.eclipse.jdt.core/buildnotes_jdt-core.html
@@ -48,7 +48,9 @@ What's new in this drop</h2>
 </ul>
 
 <h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73995">73995</a>
+<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73330">73330</a>
+NullPointerException in search
+<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73995">73995</a>
 [Javadoc] Wrong warning for missing return type description for @return {@inheritDoc}
 <br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73551">73551</a>
 [Search] NPE while searching package declaration
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)
-- 
cgit v1.2.3