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 md...@apache.org on 2016/02/23 22:55:16 UTC
svn commit: r1731972 -
/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentGraph.java
Author: mduerig
Date: Tue Feb 23 21:55:16 2016
New Revision: 1731972
URL: http://svn.apache.org/viewvc?rev=1731972&view=rev
Log:
OAK-4046: NPE in oak-run graph when repository contains bulk segments
Check info map for bulk segments
Modified:
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentGraph.java
Modified: jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentGraph.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentGraph.java?rev=1731972&r1=1731971&r2=1731972&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentGraph.java (original)
+++ jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentGraph.java Tue Feb 23 21:55:16 2016
@@ -452,7 +452,7 @@ public final class SegmentGraph {
private static void writeNode(UUID node, PrintWriter writer, boolean inHead, Date epoch, SegmentTracker tracker) {
Map<String, String> sInfo = getSegmentInfoMap(node, tracker);
- if (sInfo == null) {
+ if (!sInfo.containsKey("t")) {
writer.write(node + ",b,bulk,b,-1,-1," + inHead + "\n");
} else {
String error = sInfo.get("error");