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

i2ptunnel: Fix stopping tunnel on bad args when starting,

Browse Source 
broken by new state code
This commit is contained in:
zzz
2015-04-03 23:46:24 +00:00
parent edb614d970
commit fcec43b7ca
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
View File

@ -580,7 +580,7 @@ public class TunnelController implements Logging {
*/
public void stopTunnel() {
synchronized (this) {
if (_state != TunnelState.RUNNING)
if (_state != TunnelState.STARTING && _state != TunnelState.RUNNING)
return;
changeState(TunnelState.STOPPING);
}

4
history.txt
View File

@ -1,3 +1,7 @@
2015-04-03 zzz
* i2ptunnel: Fix stopping tunnel on bad args when starting
* wrapper.config: Remove old mortbay Jetty parameters
2015-04-01 zzz
* I2CP: Allow larger client clock skew (ticket #1503)
* i2psnark: Fix changing data directory on Windows (ticket #1503)

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 15;
public final static long BUILD = 16;
/** for example "-test" */
public final static String EXTRA = "-rc";