From: Randy Baumgarte <randy@fbn.cx>
Date: Wed, 4 Apr 2012 18:06:24 +0000 (-0400)
Subject: Added check for null resource during indexing.
X-Git-Tag: version0.1.1~63
X-Git-Url: http://git.sourceforge.jp/view?p=neighbornote%2FNeighborNote.git;a=commitdiff_plain;h=c458fb1f0822f72cd09c5fe97f9ef54a444c3065

Added check for null resource during indexing.
---

diff --git a/src/cx/fbn/nevernote/threads/IndexRunner.java b/src/cx/fbn/nevernote/threads/IndexRunner.java
index f0afc15..6a25802 100644
--- a/src/cx/fbn/nevernote/threads/IndexRunner.java
+++ b/src/cx/fbn/nevernote/threads/IndexRunner.java
@@ -302,36 +302,38 @@ public class IndexRunner extends QObject implements Runnable {
 	
 	private void indexResourceContent(String guid) {
 		Resource r = conn.getNoteTable().noteResourceTable.getNoteResource(guid, true);
-		if (r.getMime().equalsIgnoreCase("application/pdf")) {
-			indexResourcePDF(r);
-			return;
-		}
-		if (r.getMime().equalsIgnoreCase("application/docx") || 
-			r.getMime().equalsIgnoreCase("application/xlsx") || 
-			r.getMime().equalsIgnoreCase("application/pptx")) {
-			indexResourceOOXML(r);
-			return;
-		}
-		if (r.getMime().equalsIgnoreCase("application/vsd") ||
-			r.getMime().equalsIgnoreCase("application/ppt") ||
-			r.getMime().equalsIgnoreCase("application/xls") ||
-			r.getMime().equalsIgnoreCase("application/msg") ||
-			r.getMime().equalsIgnoreCase("application/doc")) {
+		if (r != null && r.getMime() != null) {
+			if (r.getMime().equalsIgnoreCase("application/pdf")) {
+				indexResourcePDF(r);
+				return;
+			}
+			if (r.getMime().equalsIgnoreCase("application/docx") || 
+				r.getMime().equalsIgnoreCase("application/xlsx") || 
+				r.getMime().equalsIgnoreCase("application/pptx")) {
+				indexResourceOOXML(r);
+				return;
+			}
+			if (r.getMime().equalsIgnoreCase("application/vsd") ||
+					r.getMime().equalsIgnoreCase("application/ppt") ||
+					r.getMime().equalsIgnoreCase("application/xls") ||
+					r.getMime().equalsIgnoreCase("application/msg") ||
+					r.getMime().equalsIgnoreCase("application/doc")) {
 				indexResourceOffice(r);
 				return;
-		}
-		if (r.getMime().equalsIgnoreCase("application/rtf")) {
+			}
+			if (r.getMime().equalsIgnoreCase("application/rtf")) {
 					indexResourceRTF(r);
 					return;
-		}
-		if (r.getMime().equalsIgnoreCase("application/odf") ||
-			r.getMime().equalsIgnoreCase("application/odt") ||
-			r.getMime().equalsIgnoreCase("application/odp") ||
-			r.getMime().equalsIgnoreCase("application/odg") ||
-			r.getMime().equalsIgnoreCase("application/odb") ||
-			r.getMime().equalsIgnoreCase("application/ods")) {
-			indexResourceODF(r);
-			return;
+			}
+			if (r.getMime().equalsIgnoreCase("application/odf") ||
+				r.getMime().equalsIgnoreCase("application/odt") ||
+				r.getMime().equalsIgnoreCase("application/odp") ||
+				r.getMime().equalsIgnoreCase("application/odg") ||
+				r.getMime().equalsIgnoreCase("application/odb") ||
+				r.getMime().equalsIgnoreCase("application/ods")) {
+				indexResourceODF(r);
+				return;
+			}
 		}
 	}