2005-03-01 jrandom

* Really disable the streaming lib packet caching
    * Synchronized a message handling point in the SDK (even though its use is
      already essentially single threaded, its better to play it safe)
    * Don't add new RepublishLeaseSetJobs on failure, just requeue up the
      existing one (duh)
    * Throttle the number of concurrent pending tunnel builds across all
      pools, in addition to simply throttling the number of new requests per
      minute for each pool individually.  This should avoid the cascading
      failure when tunnel builds take too long, as no new builds will be
      created until the previous ones are handled.
    * Factored out and extended the DataHelper's unit tests for dealing with
      long and date formatting.
    * Explicitly specify the HTTP auth realm as "i2prouter", though this
      alone doesn't address the bug where jetty asks for authentication too
      much.  (thanks orion!)
    * Updated the StreamSinkServer to ignore all read bytes, rather than write
      them to the filesystem.

apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java

@@ -344,8 +344,8 @@ public class MessageInputStream extends InputStream {
                                        + " readyBlocks=" + _readyDataBlocks.size()
                                        + " readTotal=" + _readTotal);
                     }
-                    if (removed) 
-                        _cache.release(cur);
+                    //if (removed) 
+                    //    _cache.release(cur);
                 }
             } // for (int i = 0; i < length; i++) {
         }  // synchronized (_dataLock)
@@ -416,15 +416,16 @@ public class MessageInputStream extends InputStream {
     
     public void close() {
         synchronized (_dataLock) {
-            while (_readyDataBlocks.size() > 0)
-                _cache.release((ByteArray)_readyDataBlocks.remove(0));
+            //while (_readyDataBlocks.size() > 0)
+            //    _cache.release((ByteArray)_readyDataBlocks.remove(0));
+            _readyDataBlocks.clear();
              
             // we don't need the data, but we do need to keep track of the messageIds
             // received, so we can ACK accordingly
             for (Iterator iter = _notYetReadyBlocks.values().iterator(); iter.hasNext(); ) {
                 ByteArray ba = (ByteArray)iter.next();
-                //ba.setData(null);
-                _cache.release(ba);
+                ba.setData(null);
+                //_cache.release(ba);
             }
             _locallyClosed = true;
             _dataLock.notifyAll();

apps/streaming/java/src/net/i2p/client/streaming/Packet.java

@@ -209,8 +209,8 @@ public class Packet {
     /** get the actual payload of the message.  may be null */
     public ByteArray getPayload() { return _payload; }
     public void setPayload(ByteArray payload) { 
-        if ( (_payload != null) && (_payload != payload) )
-            _cache.release(_payload);
+        //if ( (_payload != null) && (_payload != payload) )
+        //    _cache.release(_payload);
         _payload = payload; 
         if ( (payload != null) && (payload.getValid() > MAX_PAYLOAD_SIZE) )
             throw new IllegalArgumentException("Too large payload: " + payload.getValid());
@@ -466,7 +466,7 @@ public class Packet {
             throw new IllegalArgumentException("length: " + length + " offset: " + offset + " begin: " + payloadBegin);
         
         // skip ahead to the payload
-        _payload = _cache.acquire(); //new ByteArray(new byte[payloadSize]);
+        _payload = new ByteArray(new byte[payloadSize]); //_cache.acquire(); 
         System.arraycopy(buffer, payloadBegin, _payload.getData(), 0, payloadSize);
         _payload.setValid(payloadSize);
         _payload.setOffset(0);