From 0d212f6478b7a55eff4c1a79d173786a37695b0b Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 28 Jul 2011 18:23:27 +0000
Subject: [PATCH] dont throw when setting to the same value

---
 .../java/src/net/i2p/client/streaming/Packet.java      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/streaming/java/src/net/i2p/client/streaming/Packet.java b/apps/streaming/java/src/net/i2p/client/streaming/Packet.java
index faff2ff72..67fdf1549 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/Packet.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/Packet.java
@@ -151,26 +151,32 @@ class Packet {
     public Packet() { }
     
     private boolean _sendStreamIdSet = false;
+
     /** what stream do we send data to the peer on?
      * @return stream ID we use to send data
      */
     public long getSendStreamId() { return _sendStreamId; }
+
     public void setSendStreamId(long id) { 
-        if ( (_sendStreamIdSet) && (_sendStreamId > 0) )
+        // allow resetting to the same id (race)
+        if ( (_sendStreamIdSet) && (_sendStreamId > 0) && _sendStreamId != id)
             throw new RuntimeException("Send stream ID already set [" + _sendStreamId + ", " + id + "]");
         _sendStreamIdSet = true;
         _sendStreamId = id; 
     }
     
     private boolean _receiveStreamIdSet = false;
+
     /** 
      * stream the replies should be sent on.  this should be 0 if the
      * connection is still being built.
      * @return stream ID we use to get data, zero if the connection is still being built.
      */
     public long getReceiveStreamId() { return _receiveStreamId; }
+
     public void setReceiveStreamId(long id) { 
-        if ( (_receiveStreamIdSet) && (_receiveStreamId > 0) ) 
+        // allow resetting to the same id (race)
+        if ( (_receiveStreamIdSet) && (_receiveStreamId > 0) && _receiveStreamId != id) 
             throw new RuntimeException("Receive stream ID already set [" + _receiveStreamId + ", " + id + "]");
         _receiveStreamIdSet = true;
         _receiveStreamId = id;