Author: catholicon
Date: Mon May 28 10:52:00 2018
New Revision: 1832377
URL: http://svn.apache.org/viewvc?rev=1832377&view=rev
Log:
OAK-7508: Text extraction timeout can lead to NPE
Also fix in oak-seach module (test to be committed under OAK-7410)
Modified:
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java
Modified:
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java?rev=1832377&r1=1832376&r2=1832377&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java
(original)
+++
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java
Mon May 28 10:52:00 2018
@@ -158,9 +158,12 @@ public class ExtractedTextCache {
if (EXTRACT_FORGET_TIMEOUT) {
return;
}
+
String id = blob.getContentIdentity();
- timeoutMap.put(id, getText(extractedText));
- storeTimeoutMap();
+ if (id != null) {
+ timeoutMap.put(id, getText(extractedText));
+ storeTimeoutMap();
+ }
}
private static String getText(ExtractedText text) {
