[freenet-cvs] r14963 - in trunk: freenet/src/freenet/client/async freenet/src/freenet/io/comm freenet/src/freenet/node freenet/src/freenet/node/fcp plugins/XMLLibrarian plugins/XMLSpider

[toad at freenetproject.org]

Author: toad
Date: 2007-09-04 17:08:37 +0000 (Tue, 04 Sep 2007)
New Revision: 14963

Modified:
   trunk/freenet/src/freenet/client/async/BinaryBlobInserter.java
   trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java
   trunk/freenet/src/freenet/node/TextModeClientInterface.java
   trunk/freenet/src/freenet/node/fcp/ClientPut.java
   trunk/plugins/XMLLibrarian/XMLLibrarian.java
   trunk/plugins/XMLSpider/XMLSpider.java
Log:
Fix a few InputStream leaks.

Modified: trunk/freenet/src/freenet/client/async/BinaryBlobInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/BinaryBlobInserter.java	2007-09-04 16:33:43 UTC (rev 14962)
+++ trunk/freenet/src/freenet/client/async/BinaryBlobInserter.java	2007-09-04 17:08:37 UTC (rev 14963)
@@ -47,6 +47,8 @@
 		
 		BinaryBlob.readBinaryBlob(dis, blocks, tolerant);
 		
+		dis.close();
+		
 		Vector myInserters = new Vector();
 		Iterator i = blocks.keys().iterator();
 		

Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java	2007-09-04 16:33:43 UTC (rev 14962)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java	2007-09-04 17:08:37 UTC (rev 14963)
@@ -359,6 +359,7 @@
     		while(bis.available() > 0){
     			outsb.append((char)bis.read());
     		}
+    		bis.close();
     		output.data.free();
     	} catch (IOException e) {
     		outsb.append("Bucket error?: " + e.getMessage());

Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPut.java	2007-09-04 16:33:43 UTC (rev 14962)
+++ trunk/freenet/src/freenet/node/fcp/ClientPut.java	2007-09-04 17:08:37 UTC (rev 14963)
@@ -6,6 +6,7 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.security.MessageDigest;
@@ -231,7 +232,9 @@
 				md.update(salt.getBytes("UTF-8"));
 			} catch (UnsupportedEncodingException e) {}
 			try {
-				SHA256.hash(data.getInputStream(), md);
+				InputStream is = data.getInputStream();
+				SHA256.hash(is, md);
+				is.close();
 			} catch (IOException e) {
 				SHA256.returnMessageDigest(md);
 				Logger.error(this, "Got IOE: " +e.getMessage(), e);

Modified: trunk/plugins/XMLLibrarian/XMLLibrarian.java
===================================================================
--- trunk/plugins/XMLLibrarian/XMLLibrarian.java	2007-09-04 16:33:43 UTC (rev 14962)
+++ trunk/plugins/XMLLibrarian/XMLLibrarian.java	2007-09-04 17:08:37 UTC (rev 14963)
@@ -4,6 +4,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileWriter;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
@@ -690,7 +691,8 @@
 		SAXParserFactory factory = SAXParserFactory.newInstance();
 		try {
 			SAXParser saxParser = factory.newSAXParser();
-			saxParser.parse(res.asBucket().getInputStream(), new LibrarianHandler() );
+			InputStream is = res.asBucket().getInputStream();
+			saxParser.parse(is, new LibrarianHandler() );
 		} catch (Throwable err) {
 			err.printStackTrace ();}
 
@@ -728,7 +730,9 @@
 			SAXParserFactory factory = SAXParserFactory.newInstance();
 			try {
 				SAXParser saxParser = factory.newSAXParser();
-				saxParser.parse(res.asBucket().getInputStream(), new LibrarianHandler() );
+				InputStream is = res.asBucket().getInputStream();
+				saxParser.parse(is, new LibrarianHandler() );
+				is.close();
 			} catch (Throwable err) {
 				err.printStackTrace ();}
 		}

Modified: trunk/plugins/XMLSpider/XMLSpider.java
===================================================================
--- trunk/plugins/XMLSpider/XMLSpider.java	2007-09-04 16:33:43 UTC (rev 14962)
+++ trunk/plugins/XMLSpider/XMLSpider.java	2007-09-04 17:08:37 UTC (rev 14963)
@@ -125,7 +125,7 @@
 /*
  * minTimeBetweenEachIndexRewriting in seconds 
  */
-	private static final int minTimeBetweenEachIndexRewriting = 1000;
+	private static final int minTimeBetweenEachIndexRewriting = 60;
 	/**
 	 * directory where the generated indices are stored. 
 	 * Needs to be created before it can be used
@@ -417,7 +417,7 @@
 		}
 
 		if(Logger.shouldLog(Logger.MINOR, this))
-			Logger.minor(this, "Spider: indexes regenerated.");
+			Logger.minor(this, "Spider: indexes regenerated - tProducedIndex="+(System.currentTimeMillis()-tProducedIndex)+"ms ago time taken="+time_taken+"ms");
 
 		//The main xml file is generated 
 		//As each word is generated enter it into the respective subindex