From fde7b21ca43db3d73e930d53412ce6f0fbb94e03 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 19 Feb 2011 17:36:37 +0000
Subject: [PATCH] * I2PTunnel: Fix standalone server tunnels
http://forum.i2p/viewtopic.php?t=5376
---
.../java/src/net/i2p/i2ptunnel/I2PTunnelServer.java | 4 +++-
history.txt | 5 +++++
router/java/src/net/i2p/router/RouterVersion.java | 4 ++--
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
index 31f5f1783..babdba976 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
@@ -210,7 +210,9 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
*
*/
public void startRunning() {
- Thread t = new I2PAppThread(this, "Server " + remoteHost + ':' + remotePort, true);
+ // prevent JVM exit when running outside the router
+ boolean isDaemon = getTunnel().getContext().isRouterContext();
+ Thread t = new I2PAppThread(this, "Server " + remoteHost + ':' + remotePort, isDaemon);
t.start();
}
diff --git a/history.txt b/history.txt
index 39cbf8e37..83cbcc3c6 100644
--- a/history.txt
+++ b/history.txt
@@ -1,5 +1,10 @@
+2011-02-19 zzz
+ * I2PTunnel: Fix standalone server tunnels
+ http://forum.i2p/viewtopic.php?t=5376
+
2011-02-18 Mathiasdm
* Desktopgui now has an option to be disabled (desktopgui.enabled)
+
2011-02-17 zzz
* Build:
- Add includeAntRuntime=false to all javac targets
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 31c35f8c3..25340f779 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,10 +18,10 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
- public final static long BUILD = 14;
+ public final static long BUILD = 15;
/** for example "-test" */
- public final static String EXTRA = "";
+ public final static String EXTRA = "-rc";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
public static void main(String args[]) {
System.out.println("I2P Router version: " + FULL_VERSION);
--
GitLab