Author: tommaso
Date: Fri Oct 19 09:30:34 2018
New Revision: 1844321
URL: http://svn.apache.org/viewvc?rev=1844321&view=rev
Log:
OAK-7839 - minor fix to prevent NPEs in case MeterStat is not registered
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java?rev=1844321&r1=1844320&r2=1844321&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java
Fri Oct 19 09:30:34 2018
@@ -88,7 +88,7 @@ public class TrackingCorruptIndexHandler
CorruptIndexInfo info = indexes.remove(indexPath);
if (info != null){
log.info("Index at [{}] which was so far failing {} is now
working again.", info.path, info.getStats());
- } else {
+ } else if (meter != null) {
meter.mark();
}
}