boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@273 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
theli 20 years ago
parent 3ee35b9ff9
commit a2e5018427
3 changed files with 107 additions and 86 deletions
Show Stats Download Patch File Download Diff File

93
htroot/EditProfile_p.java
Unescape View File

@ -1,49 +1,49 @@
// EditProfile_p.java //EditProfile_p.java
// ----------------------- //-----------------------
// part of YACY //part of YACY
// (C) by Michael Peter Christen; mc@anomic.de //(C) by Michael Peter Christen; mc@anomic.de
// first published on http://www.anomic.de //first published on http://www.anomic.de
// Frankfurt, Germany, 2004, 2005 //Frankfurt, Germany, 2004, 2005
// //
// This File is contributed by Alexander Schier //This File is contributed by Alexander Schier
// last change: 27.02.2005 //last change: 27.02.2005
// //
// This program is free software; you can redistribute it and/or modify //This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by //it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or //the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version. //(at your option) any later version.
// //
// This program is distributed in the hope that it will be useful, //This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of //but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. //GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License //You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software //along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// Using this software in any meaning (reading, learning, copying, compiling, //Using this software in any meaning (reading, learning, copying, compiling,
// running) means that you agree that the Author(s) is (are) not responsible //running) means that you agree that the Author(s) is (are) not responsible
// for cost, loss of data or any harm that may be caused directly or indirectly //for cost, loss of data or any harm that may be caused directly or indirectly
// by usage of this softare or this documentation. The usage of this software //by usage of this softare or this documentation. The usage of this software
// is on your own risk. The installation and usage (starting/running) of this //is on your own risk. The installation and usage (starting/running) of this
// software may allow other people or application to access your computer and //software may allow other people or application to access your computer and
// any attached devices and is highly dependent on the configuration of the //any attached devices and is highly dependent on the configuration of the
// software which must be done by the user of the software; the author(s) is //software which must be done by the user of the software; the author(s) is
// (are) also not responsible for proper configuration and usage of the //(are) also not responsible for proper configuration and usage of the
// software, even if provoked by documentation provided together with //software, even if provoked by documentation provided together with
// the software. //the software.
// //
// Any changes to this file according to the GPL as documented in the file //Any changes to this file according to the GPL as documented in the file
// gpl.txt aside this file in the shipment you received can be done to the //gpl.txt aside this file in the shipment you received can be done to the
// lines that follows this copyright notice here, but changes must not be //lines that follows this copyright notice here, but changes must not be
// done inside the copyright notive above. A re-distribution must contain //done inside the copyright notive above. A re-distribution must contain
// the intact and unchanged copyright notice. //the intact and unchanged copyright notice.
// Contributions and changes to the program code must be marked as such. //Contributions and changes to the program code must be marked as such.
// You must compile this file with //You must compile this file with
// javac -classpath .:../Classes Blacklist_p.java //javac -classpath .:../Classes Blacklist_p.java
// if the shell's current path is HTROOT //if the shell's current path is HTROOT
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
@ -61,10 +61,15 @@ public class EditProfile_p {
//listManager.switchboard = (plasmaSwitchboard) env; //listManager.switchboard = (plasmaSwitchboard) env;
serverObjects prop = new serverObjects(); serverObjects prop = new serverObjects();
Properties profile = new Properties(); Properties profile = new Properties();
FileInputStream fileIn = null;
try{ 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")){ if(post != null && post.containsKey("set")){
profile.setProperty("name", (String)post.get("name")); profile.setProperty("name", (String)post.get("name"));
profile.setProperty("nickname", (String)post.get("nickname")); profile.setProperty("nickname", (String)post.get("nickname"));
@ -90,9 +95,13 @@ public class EditProfile_p {
prop.put("comment", profile.getProperty("comment", "")); prop.put("comment", profile.getProperty("comment", ""));
FileOutputStream fileOut = null;
try{ 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){ }catch(IOException e){
} finally {
if (fileOut != null) try { fileOut.close(); } catch (Exception e) {}
} }
return prop; return prop;

11
htroot/sharedBlacklist_p.java
Unescape View File

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

9
htroot/yacy/profile.java
Unescape View File

@ -64,10 +64,15 @@ public class profile {
int count=0; int count=0;
String key=""; String key="";
String value=""; 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){} }catch(IOException e){}
finally {
if (fileIn!=null) try{fileIn.close(); fileIn=null;}catch(Exception e) {}
}
Iterator it = ((Map)profile).keySet().iterator(); Iterator it = ((Map)profile).keySet().iterator();
while(it.hasNext()){ while(it.hasNext()){

Write Preview
Loading…
Cancel
Save