From 3631efa5672669f328244c7a48ba2b4df7c39888 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 1 Mar 2017 16:41:19 +0000
Subject: [PATCH] Fixup for PathMap generics Remove dup returns

---
 apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java   | 4 ++--
 router/java/src/net/i2p/router/startup/WorkingDir.java | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java b/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java
index d064f1d20..83c82b591 100644
--- a/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java
+++ b/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java
@@ -80,7 +80,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
     private transient OutputStream _out;
     private transient OutputStream _fileOut;
     private transient DateCache _logDateCache;
-    private transient PathMap _ignorePathMap;
+    private transient PathMap<String> _ignorePathMap;
     private transient Writer _writer;
     private transient ArrayList<Utf8StringBuilder> _buffers;
     private transient char[] _copy;
@@ -472,7 +472,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
         
         if (_ignorePaths != null && _ignorePaths.length > 0)
         {
-            _ignorePathMap = new PathMap();
+            _ignorePathMap = new PathMap<String>();
             for (int i = 0; i < _ignorePaths.length; i++) 
                 _ignorePathMap.put(_ignorePaths[i], _ignorePaths[i]);
         }
diff --git a/router/java/src/net/i2p/router/startup/WorkingDir.java b/router/java/src/net/i2p/router/startup/WorkingDir.java
index 9d4fb5128..383c1f582 100644
--- a/router/java/src/net/i2p/router/startup/WorkingDir.java
+++ b/router/java/src/net/i2p/router/startup/WorkingDir.java
@@ -327,7 +327,6 @@ public class WorkingDir {
         } catch (IOException ioe) {
             if (in != null) {
                 System.err.println("FAILED copy " + oldFile + ": " + ioe);
-                return false;
             }
             return false;
         } finally {
@@ -365,7 +364,6 @@ public class WorkingDir {
         } catch (IOException ioe) {
             if (in != null) {
                 System.err.println("FAILED copy " + oldFile + ": " + ioe);
-                return false;
             }
             return false;
         } finally {