From d84d045849e6eb4b928f41af9b1fc1dd1108e118 Mon Sep 17 00:00:00 2001 From: jrandom Date: Mon, 8 Aug 2005 21:20:08 +0000 Subject: [PATCH] deal with full windows without *cough* NPEs (how many times can I cvs rtag -F before going crazy?) --- .../src/net/i2p/client/streaming/ConnectionPacketHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java index cbe42e8b4f..b92fbaee86 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java @@ -196,8 +196,8 @@ public class ConnectionPacketHandler { // could actually be acking data (this fixes the buggered up ack of packet 0 problem). // this is called after packet verification, which places the stream IDs as necessary if // the SYN verifies (so if we're acking w/out stream IDs, no SYN has been received yet) - if ( (packet.getSendStreamId() != null) && (packet.getReceiveStreamId() != null) && - (con.getSendStreamId() != null) && (con.getReceiveStreamId() != null) && + if ( (packet != null) && (packet.getSendStreamId() != null) && (packet.getReceiveStreamId() != null) && + (con != null) && (con.getSendStreamId() != null) && (con.getReceiveStreamId() != null) && (!DataHelper.eq(packet.getSendStreamId(), Packet.STREAM_ID_UNKNOWN)) && (!DataHelper.eq(packet.getReceiveStreamId(), Packet.STREAM_ID_UNKNOWN)) && (!DataHelper.eq(con.getSendStreamId(), Packet.STREAM_ID_UNKNOWN)) &&