From 2c97dc2bcd7b859e0f11e738700807aa9d973485 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 8 Jun 2019 16:12:51 +0000
Subject: [PATCH] Job: Deprecate getAddedBy(), suppress warnings

---
 router/java/src/net/i2p/router/Job.java            | 5 +++++
 router/java/src/net/i2p/router/JobImpl.java        | 2 ++
 router/java/src/net/i2p/router/JobQueue.java       | 3 +++
 router/java/src/net/i2p/router/JobQueueRunner.java | 4 +---
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/router/java/src/net/i2p/router/Job.java b/router/java/src/net/i2p/router/Job.java
index 9ca34fff51..0fecede9c1 100644
--- a/router/java/src/net/i2p/router/Job.java
+++ b/router/java/src/net/i2p/router/Job.java
@@ -30,6 +30,11 @@ public interface Job {
      */
     public void runJob();
     
+    /**
+     *  @deprecated
+     *  @return null always
+     */
+    @Deprecated
     public Exception getAddedBy();
     
     /** 
diff --git a/router/java/src/net/i2p/router/JobImpl.java b/router/java/src/net/i2p/router/JobImpl.java
index 54275fd19f..f6bafcb959 100644
--- a/router/java/src/net/i2p/router/JobImpl.java
+++ b/router/java/src/net/i2p/router/JobImpl.java
@@ -59,7 +59,9 @@ public abstract class JobImpl implements Job {
      *  @return null always
      */
     @Deprecated
+    @SuppressWarnings("deprecation")
     public Exception getAddedBy() { return null; }
+
     public long getMadeReadyOn() { return _madeReadyOn; }
     public void madeReady() { _madeReadyOn = _context.clock().now(); }
     public void dropped() {}
diff --git a/router/java/src/net/i2p/router/JobQueue.java b/router/java/src/net/i2p/router/JobQueue.java
index 5f3ea91ec0..b5f7ae1011 100644
--- a/router/java/src/net/i2p/router/JobQueue.java
+++ b/router/java/src/net/i2p/router/JobQueue.java
@@ -728,7 +728,10 @@ public class JobQueue {
         public long getJobId() { return POISON_ID; }
         public JobTiming getTiming() { return null; }
         public void runJob() {}
+
+        @SuppressWarnings("deprecation")
         public Exception getAddedBy() { return null; }
+
         public void dropped() {}
     }
 
diff --git a/router/java/src/net/i2p/router/JobQueueRunner.java b/router/java/src/net/i2p/router/JobQueueRunner.java
index ecc4cd954a..07be132f13 100644
--- a/router/java/src/net/i2p/router/JobQueueRunner.java
+++ b/router/java/src/net/i2p/router/JobQueueRunner.java
@@ -144,9 +144,7 @@ class JobQueueRunner extends I2PThread {
         } catch (Throwable t) {
             //_state = 21;
             _log.log(Log.CRIT, "Error processing job [" + _currentJob.getName() 
-                                   + "] on thread " + _id + ": " + t.getMessage(), t);
-            //if (_log.shouldLog(Log.ERROR))
-            //    _log.error("The above job was enqueued by: ", _currentJob.getAddedBy());
+                                   + "] on thread " + _id + ": " + t, t);
         }
     }
 }