AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Router: Don't fail migration at install if missing eepsite/ or clients.config,

Browse Source 
for embedded applications.

Ensure a migration failure is logged if file does exist.
Reported and tested by zlatinb
This commit is contained in:
zzz
2021-04-09 09:08:36 -04:00
parent 009eb8c9f6
commit f0e606cc46
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
router/java/src/net/i2p/router/startup/WorkingDir.java
View File

@@ -361,6 +361,8 @@ public class WorkingDir {
*/
private static boolean migrateClientsConfig(File olddir, File todir) {
File oldFile = new File(olddir, "clients.config");
if (!oldFile.exists())
return true;
File newFile = new File(todir, "clients.config");
FileInputStream in = null;
PrintWriter out = null;
@@ -389,9 +391,7 @@ public class WorkingDir {
throw new IOException("Failed write to " + newFile);
return true;
} catch (IOException ioe) {
if (in != null) {
System.err.println("FAILED copy " + oldFile + ": " + ioe);
}
System.err.println("FAILED copy " + oldFile + ": " + ioe);
return false;
} finally {
if (in != null) try { in.close(); } catch (IOException ioe) {}
@@ -406,6 +406,8 @@ public class WorkingDir {
*/
static boolean migrateJettyXml(File olddir, File todir, String filename, String oldString, String newString) {
File oldFile = new File(olddir, filename);
if (!oldFile.exists())
return true;
File newFile = new File(todir, filename);
FileInputStream in = null;
PrintWriter out = null;
@@ -426,9 +428,7 @@ public class WorkingDir {
System.err.println("Copied " + oldFile + " with modifications");
return true;
} catch (IOException ioe) {
if (in != null) {
System.err.println("FAILED copy " + oldFile + ": " + ioe);
}
System.err.println("FAILED copy " + oldFile + ": " + ioe);
return false;
} finally {
if (in != null) try { in.close(); } catch (IOException ioe) {}