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/05 10:21:40 UTC
svn commit: r1728620 -
/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentGraph.java
Author: mduerig
Date: Fri Feb 5 09:21:40 2016
New Revision: 1728620
URL: http://svn.apache.org/viewvc?rev=1728620&view=rev
Log:
OAK-3978: Add segment size to segment graph
Replace hand crafted method with com.google.common.base.Throwables#getStackTraceAsString
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=1728620&r1=1728619&r2=1728620&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 Fri Feb 5 09:21:40 2016
@@ -21,6 +21,7 @@ package org.apache.jackrabbit.oak.plugin
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Throwables.getStackTraceAsString;
import static com.google.common.collect.Maps.newHashMap;
import static com.google.common.collect.Sets.newHashSet;
import static java.lang.String.valueOf;
@@ -34,7 +35,6 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.StringReader;
-import java.io.StringWriter;
import java.util.Date;
import java.util.HashSet;
import java.util.Map;
@@ -549,18 +549,7 @@ public final class SegmentGraph {
infoMap.put("size", valueOf(getSize()));
return infoMap;
} catch (SegmentNotFoundException e) {
- return singletonMap("error", toString(e));
- }
- }
-
- private static String toString(Throwable e) {
- StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw, true);
- try {
- e.printStackTrace(pw);
- return sw.toString();
- } finally {
- pw.close();
+ return singletonMap("error", getStackTraceAsString(e));
}
}