*) adding missing calls for function close() to avoid "too many open file" bug

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@273 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/EditProfile_p.java

@@ -61,10 +61,15 @@ public class EditProfile_p {
         //listManager.switchboard = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();
         Properties profile = new Properties();
+        FileInputStream fileIn = null;
         try{
-		profile.load(new FileInputStream(new File("DATA/SETTINGS/profile.txt")));
+            fileIn = new FileInputStream(new File("DATA/SETTINGS/profile.txt"));
+            profile.load(fileIn);            
+        } catch(IOException e){            
+        } finally {
+            if (fileIn != null) try { fileIn.close(); } catch (Exception e) {}
+        }
         
-	}catch(IOException e){}
         if(post != null && post.containsKey("set")){
             profile.setProperty("name", (String)post.get("name"));
             profile.setProperty("nickname", (String)post.get("nickname"));
@@ -90,9 +95,13 @@ public class EditProfile_p {
         
         prop.put("comment", profile.getProperty("comment", ""));
         
+        FileOutputStream fileOut = null;
         try{
-		profile.store( new FileOutputStream(new File("DATA/SETTINGS/profile.txt")), null );
+            fileOut = new FileOutputStream(new File("DATA/SETTINGS/profile.txt"));
+            profile.store(fileOut , null );
         }catch(IOException e){             
+        } finally {
+            if (fileOut != null) try { fileOut.close(); } catch (Exception e) {}
         }
         
         return prop;

htroot/sharedBlacklist_p.java

@@ -94,9 +94,11 @@ public class sharedBlacklist_p {
 	}else{
 		filename = "shared.black";
 	}
+    
+    BufferedReader br = null;
 	try{
 		//Read the List 
-		BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(new File(listsPath, filename))));
+		br = new BufferedReader(new InputStreamReader(new FileInputStream(new File(listsPath, filename))));
 		while((line = br.readLine()) != null){
 			if(! (line.startsWith("#") || line.equals("")) ){
 				Blacklist.add(line);
@@ -105,6 +107,9 @@ public class sharedBlacklist_p {
 		}
 		br.close();
 	}catch(IOException e){}
+    finally {
+        if (br!=null) try{br.close(); br=null;}catch(Exception e){}
+    }
 
 	prop.put("page", 0); //checkbox list
 	if( post != null && post.containsKey("hash") ){ //Step 1: retrieve the Items
@@ -187,7 +192,7 @@ public class sharedBlacklist_p {
 
 		try{
 			//Read the List
-			BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream( (String)post.get("file") )));
+			br = new BufferedReader(new InputStreamReader(new FileInputStream( (String)post.get("file") )));
 			while((line = br.readLine()) != null){
 				if(! (line.startsWith("#") || line.equals("")) ){
 					otherBlacklist.add(line);
@@ -196,6 +201,8 @@ public class sharedBlacklist_p {
 			br.close();
 		}catch(IOException e){
 			prop.put("status", 2); //File Error
+		} finally {
+            if (br != null) try {br.close(); br = null; } catch (Exception e){}
         }
 		Name = (String)post.get("file");
 

htroot/yacy/profile.java

@@ -64,10 +64,15 @@ public class profile {
 	int count=0;
 	String key="";
 	String value="";
-	try{
-		profile.load(new FileInputStream(new File("DATA/SETTINGS/profile.txt")));
     
+    FileInputStream fileIn = null;
+	try{
+        fileIn = new FileInputStream(new File("DATA/SETTINGS/profile.txt"));
+		profile.load(fileIn);		
 	}catch(IOException e){}
+    finally {
+        if (fileIn!=null) try{fileIn.close(); fileIn=null;}catch(Exception e) {}
+    }
 	
 	Iterator it = ((Map)profile).keySet().iterator();
 	while(it.hasNext()){