From 64ba43c007ddc1118e6684e40ca5ebfde899f11c Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 18 Aug 2019 14:53:32 +0000
Subject: [PATCH] Jetty: Log stack trace if 2nd arg is a Throwable (ticket
 #2592)

---
 apps/jetty/java/src/net/i2p/jetty/I2PLogger.java  | 15 ++++++++++++---
 history.txt                                       |  7 +++++++
 router/java/src/net/i2p/router/RouterVersion.java |  4 ++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/apps/jetty/java/src/net/i2p/jetty/I2PLogger.java b/apps/jetty/java/src/net/i2p/jetty/I2PLogger.java
index 1586963972..af62b9be7c 100644
--- a/apps/jetty/java/src/net/i2p/jetty/I2PLogger.java
+++ b/apps/jetty/java/src/net/i2p/jetty/I2PLogger.java
@@ -73,7 +73,10 @@ public class I2PLogger implements Logger
         } else if (_log.shouldLog(Log.INFO)) {
             synchronized(_buffer) {
                 format(msg,arg0,arg1);
-                _log.info(_buffer.toString());
+                if (arg1 != null && arg1 instanceof Throwable)
+                    _log.info(_buffer.toString(), (Throwable) arg1);
+                else
+                    _log.info(_buffer.toString());
             }
         }
     }
@@ -92,7 +95,10 @@ public class I2PLogger implements Logger
         } else if (_log.shouldLog(Log.DEBUG)) {
             synchronized(_buffer) {
                 format(msg,arg0,arg1);
-                _log.debug(_buffer.toString());
+                if (arg1 != null && arg1 instanceof Throwable)
+                    _log.debug(_buffer.toString(), (Throwable) arg1);
+                else
+                    _log.debug(_buffer.toString());
             }
         }
     }
@@ -106,7 +112,10 @@ public class I2PLogger implements Logger
         } else if (_log.shouldLog(Log.WARN)) {
             synchronized(_buffer) {
                 format(msg,arg0,arg1);
-                _log.warn(_buffer.toString());
+                if (arg1 != null && arg1 instanceof Throwable)
+                    _log.warn(_buffer.toString(), (Throwable) arg1);
+                else
+                    _log.warn(_buffer.toString());
             }
         }
     }
diff --git a/history.txt b/history.txt
index 9f043eacb6..cfea48f7ae 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,10 @@
+2019-08-18 zzz
+ * Jetty: Log stack trace if 2nd arg is a Throwable (ticket #2592)
+
+2019-08-15 zzz
+ * SSU: Reduce ACK time to 150 (ticket #2574)
+ * Tunnels: Reduce IBGW batching ti9me (ticket #2586)
+
 2019-08-14 zzz
  * Console: Clean up help text, tag for translation (ticket #2298)
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index a6204817e3..47667df539 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,10 +18,10 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 8;
+    public final static long BUILD = 9;
 
     /** for example "-test" */
-    public final static String EXTRA = "";
+    public final static String EXTRA = "-rc";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + FULL_VERSION);