Fix more NPEs ticket #984

This commit is contained in:
zab2
2013-07-21 19:41:48 +00:00
parent 2313d82369
commit 7133736702
2 changed files with 2 additions and 2 deletions

View File

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

View File

@ -203,12 +203,12 @@ class NTCPConnection {
//_outbound = new CoDelPriorityBlockingQueue(ctx, "NTCP-Connection", 32); //_outbound = new CoDelPriorityBlockingQueue(ctx, "NTCP-Connection", 32);
_outbound = new PriBlockingQueue(ctx, "NTCP-Connection", 32); _outbound = new PriBlockingQueue(ctx, "NTCP-Connection", 32);
_isInbound = false; _isInbound = false;
_establishState = new EstablishState(ctx, transport, this);
_decryptBlockBuf = new byte[BLOCK_SIZE]; _decryptBlockBuf = new byte[BLOCK_SIZE];
_curReadState = new ReadState(); _curReadState = new ReadState();
_inboundListener = new InboundListener(); _inboundListener = new InboundListener();
_outboundListener = new OutboundListener(); _outboundListener = new OutboundListener();
initialize(); initialize();
_establishState = new EstablishState(ctx, transport, this);
} }
private void initialize() { private void initialize() {