From 165d813255e101f919a9cb2068d956e20bc1bd09 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 20 Apr 2016 14:29:06 +0000
Subject: [PATCH] OpenDS => OpenDJ
---
opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugStackTraceFormatter.java | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugStackTraceFormatter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugStackTraceFormatter.java
index dd52060..6e0894f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugStackTraceFormatter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugStackTraceFormatter.java
@@ -16,7 +16,7 @@
*/
package org.opends.server.loggers;
-import static org.opends.server.util.ServerConstants.EOL;
+import static org.opends.server.util.ServerConstants.*;
/**
* A DebugStackTraceFormatter converts an exception's stack trace into a String
@@ -26,13 +26,12 @@
{
/** The stack depth value to indicate the entire stack should be printed. */
public static final int COMPLETE_STACK = Integer.MAX_VALUE;
- /** A nested frame filter that removes debug and trailing no OpenDS frames. */
+ /** A nested frame filter that removes debug and trailing no OpenDJ frames. */
public static final FrameFilter SMART_FRAME_FILTER = new SmartFrameFilter();
/** A FrameFilter provides stack frame filtering used during formatting. */
interface FrameFilter
{
-
/**
* Filters out all undesired stack frames from the given Throwable's stack
* trace.
@@ -44,25 +43,21 @@
StackTraceElement[] getFilteredStackTrace(StackTraceElement[] frames);
}
- /** A basic FrameFilter that filters out frames from the debug logging and non OpenDS classes. */
+ /** A basic FrameFilter that filters out frames from the debug logging and non OpenDJ classes. */
private static class SmartFrameFilter implements FrameFilter
{
-
- private boolean isFrameForPackage(StackTraceElement frame,
- String packageName)
+ private boolean isFrameForPackage(StackTraceElement frame, String packageName)
{
- boolean isContained = false;
+ return frame != null ? startsWith(frame.getClassName(), packageName) : false;
+ }
- if (frame != null)
- {
- String className = frame.getClassName();
- isContained = className != null && className.startsWith(packageName);
- }
- return isContained;
+ private boolean startsWith(String className, String packageName)
+ {
+ return className != null && className.startsWith(packageName);
}
/**
- * Return the stack trace of an exception with debug and trailing non OpenDS
+ * Return the stack trace of an exception with debug and trailing non OpenDJ
* frames filtered out.
*
* @param frames
@@ -84,7 +79,7 @@
firstFrame++;
}
- // Skip trailing frames not in OpenDS classes
+ // Skip trailing frames not in OpenDJ classes
int lastFrame = frames.length - 1;
while (lastFrame > firstFrame
&& !isFrameForPackage(frames[lastFrame], "org.opends"))
@@ -220,7 +215,6 @@
int frameLimit = Math.min(maxDepth, stackTrace.length);
if (frameLimit > 0)
{
-
for (int i = 0; i < frameLimit; i++)
{
buffer.append(" ");
--
Gitblit v1.10.0