diff options
8 files changed, 67 insertions, 64 deletions
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java index 14449e2fc078..03390e954690 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java @@ -184,6 +184,7 @@ public class GlobalFile { } } } + inReader.close(); }catch(Exception e){ //showMessage(); return null;//Uncertain data file error. diff --git a/qadevOOo/runner/base/java_fat.java b/qadevOOo/runner/base/java_fat.java index 1b95f28ff582..031474fddd21 100644 --- a/qadevOOo/runner/base/java_fat.java +++ b/qadevOOo/runner/base/java_fat.java @@ -511,40 +511,39 @@ public class java_fat implements TestBase return entryList; } - while (line != null) + try { - try + while (line != null) { - if (!line.startsWith("#") && (line.length() > 1)) + try { - entryList.add(line.trim()); - } + if (!line.startsWith("#") && (line.length() > 1)) + { + entryList.add(line.trim()); + } - line = exclusion.readLine(); - } - catch (java.io.IOException ioe) - { - if (debug) - { - System.out.println("Exception while reading exclusion list"); + line = exclusion.readLine(); } + catch (java.io.IOException ioe) + { + if (debug) + { + System.out.println("Exception while reading exclusion list"); + } - return entryList; + return entryList; + } } } - - try - { - exclusion.close(); - } - catch (java.io.IOException ioe) + finally { - if (debug) + try + { + exclusion.close(); + } + catch (java.io.IOException ioe) { - System.out.println("Couldn't close file " + url); } - - return entryList; } return entryList; diff --git a/scripting/workben/installer/FileUpdater.java b/scripting/workben/installer/FileUpdater.java index 786b8f44bda8..21c3d34dd367 100644 --- a/scripting/workben/installer/FileUpdater.java +++ b/scripting/workben/installer/FileUpdater.java @@ -42,6 +42,7 @@ public class FileUpdater { s.trim(); xmlArray[count] = s; } + reader.close(); } catch( IOException ioe ) { String message = "\nError reading ProtocolHandler.xcu, please view SFrameworkInstall.log."; @@ -112,6 +113,7 @@ public class FileUpdater { s.trim(); xmlArray[count] = s; } + reader.close(); } catch( IOException ioe ) { String message = "Error reading script.xlc, please view SFrameworkInstall.log."; @@ -184,6 +186,7 @@ public class FileUpdater { s.trim(); xmlArray[count] = s; } + reader.close(); } catch( IOException ioe ) { diff --git a/scripting/workben/installer/InstUtil.java b/scripting/workben/installer/InstUtil.java index c6a713153e87..26ec2027b4d6 100644 --- a/scripting/workben/installer/InstUtil.java +++ b/scripting/workben/installer/InstUtil.java @@ -237,6 +237,7 @@ public class InstUtil { break; } } + reader.close(); } catch( IOException ioe ) { System.out.println( "Error reading Netbeans location information" ); @@ -285,6 +286,7 @@ public class InstUtil { jeditDetails[1] = version; } } + reader.close(); } catch( IOException ioe ) { System.out.println( "Error reading Jedit location information" ); @@ -292,7 +294,6 @@ public class InstUtil { //catch( FileNotFoundException fnfe ) { //System.out.println( "Jedit activity.log FileNotFoundException" ); //} - return jeditDetails; } @@ -408,7 +409,7 @@ public class InstUtil { } } } - + reader.close(); return results; } diff --git a/scripting/workben/installer/ZipData.java b/scripting/workben/installer/ZipData.java index 432201ff7e54..0cd144a7abfd 100644 --- a/scripting/workben/installer/ZipData.java +++ b/scripting/workben/installer/ZipData.java @@ -21,13 +21,12 @@ package installer; import java.io.*; import javax.swing.*; -public class ZipData -{ +public class ZipData { public ZipData(String file) { } public boolean extractEntry(String entry, String destination, - JLabel statusLabel) { + JLabel statusLabel) { OutputStream out = null; InputStream in = null; @@ -35,23 +34,22 @@ public class ZipData System.out.println("Copying: " + entry); System.out.println("To: " + destination); - if (statusLabel != null) { - statusLabel.setText("Copying " + entry); - } + if (statusLabel != null) { + statusLabel.setText("Copying " + entry); + } String entryName; if (entry.lastIndexOf("/") != -1) { entryName = entry.substring(entry.lastIndexOf("/") + 1); - } - else { + } else { entryName = entry; } String destName; if (destination.lastIndexOf(File.separator) != -1) { - destName = destination.substring(destination.lastIndexOf(File.separator) + 1); - } - else { + destName = destination.substring(destination + .lastIndexOf(File.separator) + 1); + } else { destName = destination; } @@ -60,20 +58,6 @@ public class ZipData System.out.println("Unzipping " + entry + " to " + destination); - try { - out = new FileOutputStream(destination); - } - catch (IOException ioe) { - System.err.println("Error opening " + destination + - ": " + ioe.getMessage()); - - if (statusLabel != null) - statusLabel.setText("Error opening" + destination + - "see SFramework.log for more information"); - - return false; - } - if (entry.startsWith("/") == false) entry = "/" + entry; @@ -82,8 +66,21 @@ public class ZipData System.err.println("File " + entry + " not found in jar file"); if (statusLabel != null) - statusLabel.setText("Failed extracting " + entry + - "see SFramework.log for more information"); + statusLabel.setText("Failed extracting " + entry + + "see SFramework.log for more information"); + + return false; + } + + try { + out = new FileOutputStream(destination); + } catch (IOException ioe) { + System.err.println("Error opening " + destination + ": " + + ioe.getMessage()); + + if (statusLabel != null) + statusLabel.setText("Error opening" + destination + + "see SFramework.log for more information"); return false; } @@ -94,22 +91,19 @@ public class ZipData while ((len = in.read(bytes)) != -1) out.write(bytes, 0, len); - } - catch (IOException ioe) { - System.err.println("Error writing " + destination + ": " + - ioe.getMessage()); + } catch (IOException ioe) { + System.err.println("Error writing " + destination + ": " + + ioe.getMessage()); if (statusLabel != null) - statusLabel.setText("Failed writing " + destination + - "see SFramework.log for more information"); + statusLabel.setText("Failed writing " + destination + + "see SFramework.log for more information"); return false; - } - finally { + } finally { try { in.close(); out.close(); - } - catch (IOException ioe) { + } catch (IOException ioe) { } } return true; diff --git a/scripting/workben/mod/_scripting/TestDataLoader.java b/scripting/workben/mod/_scripting/TestDataLoader.java index c76d4351aad5..63d360e6a678 100644 --- a/scripting/workben/mod/_scripting/TestDataLoader.java +++ b/scripting/workben/mod/_scripting/TestDataLoader.java @@ -44,10 +44,9 @@ public class TestDataLoader { if (!f.exists()) return; - BufferedReader in; try { - in = new BufferedReader(new FileReader(f)); + BufferedReader in = new BufferedReader(new FileReader(f)); String s, previous, current; ArrayList<Parameters> list = new ArrayList<Parameters>(11); @@ -59,6 +58,7 @@ public class TestDataLoader { list.add(getParameters(st)); } else { + in.close(); return; } @@ -77,6 +77,7 @@ public class TestDataLoader { } tEnv.addObjRelation(previous, list); + in.close(); } catch (IOException ioe) { } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java index 42ce0a9a427c..a06dca7b3cd7 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java @@ -113,16 +113,19 @@ public class ActiveSyncDriver { dataOut = conv.convert(); } catch (Exception e) { + fos.close(); return false; } if (dataOut == null) { + fos.close(); return false; } // Get the document and write it out. Document doc = (Document)dataOut.getDocumentEnumeration().next(); if (doc == null) { + fos.close(); return false; } diff --git a/xmlsecurity/test_docs/tools/httpserv/src/httpserv/Main.java b/xmlsecurity/test_docs/tools/httpserv/src/httpserv/Main.java index 8a604fad0310..a9bd3cee9977 100644 --- a/xmlsecurity/test_docs/tools/httpserv/src/httpserv/Main.java +++ b/xmlsecurity/test_docs/tools/httpserv/src/httpserv/Main.java @@ -142,6 +142,7 @@ class MyHandler implements HttpHandler { byte[] data = new byte[(int) fileRequest.length()]; FileInputStream fr = new FileInputStream(fileRequest); int count = fr.read(data); + fr.close(); //set the Content-type header Headers h = xchange.getResponseHeaders(); |