Changeset 3631efa

Timestamp:

Mar 1, 2017 4:41:19 PM (3 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

d3abbe8

Parents:

8bfb3649

Message:

Fixup for PathMap? generics
Remove dup returns

Files:

• apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java (modified) (2 diffs)
• router/java/src/net/i2p/router/startup/WorkingDir.java (modified) (2 diffs)

apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java

@@ -81 +81 @@
     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;
@@ -473 +473 @@
         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]);

router/java/src/net/i2p/router/startup/WorkingDir.java

@@ -328 +328 @@
             if (in != null) {
                 System.err.println("FAILED copy " + oldFile + ": " + ioe);
-                return false;
             }
             return false;
@@ -366 +365 @@
             if (in != null) {
                 System.err.println("FAILED copy " + oldFile + ": " + ioe);
-                return false;
             }
             return false;