You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by al...@apache.org on 2014/06/12 17:46:01 UTC
svn commit: r1602211 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
Author: alexparvulescu
Date: Thu Jun 12 15:46:00 2014
New Revision: 1602211
URL: http://svn.apache.org/r1602211
Log:
OAK-1877 merged revision 1602207
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1602207
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java?rev=1602211&r1=1602210&r2=1602211&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java Thu Jun 12 15:46:00 2014
@@ -238,9 +238,12 @@ public class AsyncIndexUpdate implements
name, checkpoint);
store.release(checkpoint);
} else {
- log.debug("The {} index update succeeded; releasing the previous checkpoint {}",
- name, refCheckpoint);
- store.release(refCheckpoint);
+ if (refCheckpoint != null) {
+ log.debug(
+ "The {} index update succeeded; releasing the previous checkpoint {}",
+ name, refCheckpoint);
+ store.release(refCheckpoint);
+ }
}
if (exception != null) {