diff --git a/htroot/EditProfile_p.java b/htroot/EditProfile_p.java index 747626b7b..06e6b0a8e 100644 --- a/htroot/EditProfile_p.java +++ b/htroot/EditProfile_p.java @@ -1,49 +1,49 @@ -// EditProfile_p.java -// ----------------------- -// part of YACY -// (C) by Michael Peter Christen; mc@anomic.de -// first published on http://www.anomic.de -// Frankfurt, Germany, 2004, 2005 +//EditProfile_p.java +//----------------------- +//part of YACY +//(C) by Michael Peter Christen; mc@anomic.de +//first published on http://www.anomic.de +//Frankfurt, Germany, 2004, 2005 // -// This File is contributed by Alexander Schier -// last change: 27.02.2005 +//This File is contributed by Alexander Schier +//last change: 27.02.2005 // -// 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 -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. +//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 +//the Free Software Foundation; either version 2 of the License, or +//(at your option) any later version. // -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +//This program is distributed in the hope that it will be useful, +//but WITHOUT ANY WARRANTY; without even the implied warranty of +//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//You should have received a copy of the GNU General Public License +//along with this program; if not, write to the Free Software +//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// Using this software in any meaning (reading, learning, copying, compiling, -// 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 -// 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 -// software may allow other people or application to access your computer and -// 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 -// (are) also not responsible for proper configuration and usage of the -// software, even if provoked by documentation provided together with -// the software. +//Using this software in any meaning (reading, learning, copying, compiling, +//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 +//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 +//software may allow other people or application to access your computer and +//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 +//(are) also not responsible for proper configuration and usage of the +//software, even if provoked by documentation provided together with +//the software. // -// 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 -// lines that follows this copyright notice here, but changes must not be -// done inside the copyright notive above. A re-distribution must contain -// the intact and unchanged copyright notice. -// Contributions and changes to the program code must be marked as such. +//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 +//lines that follows this copyright notice here, but changes must not be +//done inside the copyright notive above. A re-distribution must contain +//the intact and unchanged copyright notice. +//Contributions and changes to the program code must be marked as such. -// You must compile this file with -// javac -classpath .:../Classes Blacklist_p.java -// if the shell's current path is HTROOT +//You must compile this file with +//javac -classpath .:../Classes Blacklist_p.java +//if the shell's current path is HTROOT import java.io.File; import java.io.FileInputStream; @@ -56,46 +56,55 @@ import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; public class EditProfile_p { - - public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { - //listManager.switchboard = (plasmaSwitchboard) env; - serverObjects prop = new serverObjects(); - Properties profile = new Properties(); - try{ - profile.load(new FileInputStream(new File("DATA/SETTINGS/profile.txt"))); - - }catch(IOException e){} - if(post != null && post.containsKey("set")){ - profile.setProperty("name", (String)post.get("name")); - profile.setProperty("nickname", (String)post.get("nickname")); - profile.setProperty("homepage", (String)post.get("homepage")); - profile.setProperty("email", (String)post.get("email")); - - profile.setProperty("icq", (String)post.get("icq")); - profile.setProperty("jabber", (String)post.get("jabber")); - profile.setProperty("yahoo", (String)post.get("yahoo")); - profile.setProperty("msn", (String)post.get("msn")); - - profile.setProperty("comment", (String)post.get("comment")); - } - prop.put("name", profile.getProperty("name", "")); - prop.put("nickname", profile.getProperty("nickname", "")); - prop.put("homepage", profile.getProperty("homepage", "")); - prop.put("email", profile.getProperty("email", "")); - - prop.put("icq", profile.getProperty("icq", "")); - prop.put("jabber", profile.getProperty("jabber", "")); - prop.put("yahoo", profile.getProperty("yahoo", "")); - prop.put("msn", profile.getProperty("msn", "")); - - prop.put("comment", profile.getProperty("comment", "")); - - try{ - profile.store( new FileOutputStream(new File("DATA/SETTINGS/profile.txt")), null ); - }catch(IOException e){ - } - - return prop; + + public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { + //listManager.switchboard = (plasmaSwitchboard) env; + serverObjects prop = new serverObjects(); + Properties profile = new Properties(); + 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(); } catch (Exception e) {} + } + + if(post != null && post.containsKey("set")){ + profile.setProperty("name", (String)post.get("name")); + profile.setProperty("nickname", (String)post.get("nickname")); + profile.setProperty("homepage", (String)post.get("homepage")); + profile.setProperty("email", (String)post.get("email")); + + profile.setProperty("icq", (String)post.get("icq")); + profile.setProperty("jabber", (String)post.get("jabber")); + profile.setProperty("yahoo", (String)post.get("yahoo")); + profile.setProperty("msn", (String)post.get("msn")); + + profile.setProperty("comment", (String)post.get("comment")); + } + prop.put("name", profile.getProperty("name", "")); + prop.put("nickname", profile.getProperty("nickname", "")); + prop.put("homepage", profile.getProperty("homepage", "")); + prop.put("email", profile.getProperty("email", "")); + + prop.put("icq", profile.getProperty("icq", "")); + prop.put("jabber", profile.getProperty("jabber", "")); + prop.put("yahoo", profile.getProperty("yahoo", "")); + prop.put("msn", profile.getProperty("msn", "")); + + prop.put("comment", profile.getProperty("comment", "")); + + FileOutputStream fileOut = null; + try{ + 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; } - + } diff --git a/htroot/sharedBlacklist_p.java b/htroot/sharedBlacklist_p.java index 4475fc87a..f3b1e224f 100644 --- a/htroot/sharedBlacklist_p.java +++ b/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)))); + //Read the List + 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,7 +201,9 @@ 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"); //Make HTML-Optionlist with retrieved items diff --git a/htroot/yacy/profile.java b/htroot/yacy/profile.java index b127e9502..5942d0f5f 100644 --- a/htroot/yacy/profile.java +++ b/htroot/yacy/profile.java @@ -64,10 +64,15 @@ public class profile { int count=0; String key=""; String value=""; + + 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(); fileIn=null;}catch(Exception e) {} + } Iterator it = ((Map)profile).keySet().iterator(); while(it.hasNext()){