From 1122bf394cd692cce1c75b9aa03cccbf87611240 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Mon, 8 Apr 2019 23:06:11 +0200
Subject: [PATCH] Add ExceptionUtil

---
 .../smack/debugger/ConsoleDebugger.java       | 11 ++----
 .../smack/util/ExceptionUtil.java             | 38 +++++++++++++++++++
 2 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 smack-core/src/main/java/org/jivesoftware/smack/util/ExceptionUtil.java

diff --git a/smack-core/src/main/java/org/jivesoftware/smack/debugger/ConsoleDebugger.java b/smack-core/src/main/java/org/jivesoftware/smack/debugger/ConsoleDebugger.java
index fb5d80a69..def9b310e 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/debugger/ConsoleDebugger.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/debugger/ConsoleDebugger.java
@@ -16,12 +16,11 @@
  */
 package org.jivesoftware.smack.debugger;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smack.util.ExceptionUtil;
 
 /**
  * Very simple debugger that prints to the console (stdout) the sent and received stanzas. Use
@@ -55,12 +54,8 @@ public class ConsoleDebugger extends AbstractDebugger {
 
     @Override
     protected void log(String logMessage, Throwable throwable) {
-        StringWriter sw = new StringWriter();
-        PrintWriter pw = new PrintWriter(sw);
-        // CHECKSTYLE:OFF
-        throwable.printStackTrace(pw);
-        // CHECKSTYLE:ON
-        log(logMessage + sw);
+        String stacktrace = ExceptionUtil.getStackTrace(throwable);
+        log(logMessage + '\n' + stacktrace);
     }
 
     public static final class Factory implements SmackDebuggerFactory {
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/ExceptionUtil.java b/smack-core/src/main/java/org/jivesoftware/smack/util/ExceptionUtil.java
new file mode 100644
index 000000000..1c282381a
--- /dev/null
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/ExceptionUtil.java
@@ -0,0 +1,38 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.util;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+public class ExceptionUtil {
+
+    public static String getStackTrace(Throwable throwable) {
+        StringWriter stringWriter = new StringWriter();
+        PrintWriter printWriter = new PrintWriter(stringWriter);
+
+        // CHECKSTYLE:OFF
+        throwable.printStackTrace(printWriter);
+        // CHECKSTYLE:ON
+
+        printWriter.flush();
+
+        StringBuffer stringBuffer = stringWriter.getBuffer();
+        return stringBuffer.toString();
+    }
+
+}