From 71337367022b282763e3201868ad085d14f2a1ce Mon Sep 17 00:00:00 2001
From: zab2 <zab2@mail.i2p>
Date: Sun, 21 Jul 2013 19:41:48 +0000
Subject: [PATCH] Fix more NPEs ticket #984
---
router/java/src/net/i2p/router/RouterVersion.java | 2 +-
.../java/src/net/i2p/router/transport/ntcp/NTCPConnection.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index c10128fe62..fecba78d69 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 = 6;
+ public final static long BUILD = 7;
/** for example "-test" */
public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java
index 7944bfaa31..38f8a29d77 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java
@@ -203,12 +203,12 @@ class NTCPConnection {
//_outbound = new CoDelPriorityBlockingQueue(ctx, "NTCP-Connection", 32);
_outbound = new PriBlockingQueue(ctx, "NTCP-Connection", 32);
_isInbound = false;
+ _establishState = new EstablishState(ctx, transport, this);
_decryptBlockBuf = new byte[BLOCK_SIZE];
_curReadState = new ReadState();
_inboundListener = new InboundListener();
_outboundListener = new OutboundListener();
initialize();
- _establishState = new EstablishState(ctx, transport, this);
}
private void initialize() {
--
GitLab