[freenet-cvs] r22162 - trunk/freenet/src/freenet/support/io

[nextg...@freenetproject.org]

Author: nextgens
Date: 2008-08-25 22:45:14 +0000 (Mon, 25 Aug 2008)
New Revision: 22162

Modified:
   trunk/freenet/src/freenet/support/io/TempBucketFactory.java
Log:
TempBucket: get rid of dead code

Modified: trunk/freenet/src/freenet/support/io/TempBucketFactory.java
===================================================================
--- trunk/freenet/src/freenet/support/io/TempBucketFactory.java 2008-08-25 
22:39:38 UTC (rev 22161)
+++ trunk/freenet/src/freenet/support/io/TempBucketFactory.java 2008-08-25 
22:45:14 UTC (rev 22162)
@@ -13,7 +13,6 @@
 import freenet.support.api.Bucket;
 import freenet.support.api.BucketFactory;

-import java.io.BufferedOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.LinkedList;
@@ -65,7 +64,6 @@
                private Bucket currentBucket;
                private long currentSize;
                private OutputStream os = null;
-               private InputStream is = null;
                private short osIndex;
                private volatile boolean shouldResetOS = false;
                private volatile boolean shouldResetIS = false;
@@ -91,7 +89,6 @@
                                toMigrate = currentBucket;
                                Bucket tempFB = _makeFileBucket();
                                os = tempFB.getOutputStream();
-                               is = tempFB.getInputStream();
                                BucketTools.copyTo(tempFB, os, currentSize);
                                if(toMigrate.isReadOnly())
                                        tempFB.setReadOnly();
@@ -233,7 +230,7 @@

                                if(shouldResetIS) {
                                        Closer.close(currentIS);
-                                       currentIS = (is == null ? 
currentBucket.getInputStream() : is);
+                                       currentIS = 
currentBucket.getInputStream();
                                        currentIS.skip(index);
                                        shouldResetIS = false;
                                }