Changeset a474bd4

Timestamp:

Apr 10, 2018 3:23:41 PM (3 years ago)

Author:

meeh <meeh@…>

Branches:

master

Children:

57e21e90

Parents:

f00ac6a (diff), 7ae8381 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge of '3acb036bb44bfe12916742877b1b2298ef6a156a'

and '674ef573b3a8e4620f0e06397e062d86fc87a5a9'

Location:

router/java/src/net/i2p/router

Files:

• Router.java (modified) (1 diff)
• startup/PortableWorkingDir.java (modified) (2 diffs)

router/java/src/net/i2p/router/Router.java

@@ -276 +276 @@
         String isPortableStr = System.getProperty("i2p.dir.portableMode");
         boolean isPortable = Boolean.parseBoolean(isPortableStr);
-        String userDir = (!isPortable) ? WorkingDir.getWorkingDir(envProps, migrateFiles) : PortableWorkingDir.getWorkingDir(envProps, migrateFiles);
+        String userDir = (!isPortable) ? WorkingDir.getWorkingDir(envProps, migrateFiles) : PortableWorkingDir.getWorkingDir(envProps);
 
         // Use the router.config file specified in the router.configLocation property

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

@@ -24 +24 @@
  * Just FYI:
  * In the context of a BB:
- * 
+ *
  * On OSX it has to look 3 paths up, but for the other two, only one.
  *
@@ -47 +47 @@
  * @author (who to blame) Meeh
  * @version 0.2
+ * @since 0.9.35
  */
 public class PortableWorkingDir {