From 36e898d66832ae5f7948615cb2dd6e8504787044 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 14 Jun 2013 13:34:36 +0000
Subject: [PATCH]  * I2CP: Fix deserialization of new RVLSM; enable by default

---
 .../net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java | 2 +-
 history.txt                                               | 8 ++++++++
 router/java/src/net/i2p/router/RouterVersion.java         | 2 +-
 .../src/net/i2p/router/client/RequestLeaseSetJob.java     | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java
index 42bfdf586..b29603755 100644
--- a/core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java
@@ -77,7 +77,7 @@ public class RequestVariableLeaseSetMessage extends I2CPMessageImpl {
     @Override
     protected void doReadMessage(InputStream in, int size) throws I2CPMessageException, IOException {
         try {
-            if (_sessionId == null)
+            if (_sessionId != null)
                 throw new IllegalStateException();
             _sessionId = new SessionId();
             _sessionId.readBytes(in);
diff --git a/history.txt b/history.txt
index 478f355b6..bde637f0d 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,11 @@
+2013-06-14 zzz
+ * I2CP: Fix deserialization of new RVLSM; enable by default
+ * i2psnark: Fix bug creating torrent with a single file in a directory
+
+2013-06-12 zzz
+ * Console: Add missing jetty jars to classpath (ticket #952)
+ * I2PTunnel: Add advanced quantity options
+
 2013-06-10 kytv
  * Translations (from Transifex)
    - Start of Turkish language translation
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index a6204817e..f2522cd4e 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -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 = 8;
+    public final static long BUILD = 9;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java b/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java
index 5ed35facc..bd153fbdd 100644
--- a/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java
+++ b/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java
@@ -38,7 +38,7 @@ class RequestLeaseSetJob extends JobImpl {
 
     /** temp for testing */
     private static final String PROP_VARIABLE = "router.variableLeaseExpiration";
-    private static final boolean DFLT_VARIABLE = false;
+    private static final boolean DFLT_VARIABLE = true;
 
     public RequestLeaseSetJob(RouterContext ctx, ClientConnectionRunner runner, LeaseRequestState state) {
         super(ctx);