You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by js...@apache.org on 2006/05/20 05:23:52 UTC
svn commit: r407948 -
/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/InPlaceConfigurationUtil.java
Author: jsisson
Date: Fri May 19 20:23:51 2006
New Revision: 407948
URL: http://svn.apache.org/viewvc?rev=407948&view=rev
Log:
GERONIMO-2035 - improve outputstream close logic
Modified:
geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/InPlaceConfigurationUtil.java
Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/InPlaceConfigurationUtil.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/InPlaceConfigurationUtil.java?rev=407948&r1=407947&r2=407948&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/InPlaceConfigurationUtil.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/InPlaceConfigurationUtil.java Fri May 19 20:23:51 2006
@@ -56,15 +56,14 @@
File inPlaceConfigurationDir = configurationData.getInPlaceConfigurationDir();
String absolutePath = inPlaceConfigurationDir.getAbsolutePath();
writer.write(absolutePath);
+ writer.close(); // also flushes the stream and shouldn't normally fail
+ writer = null;
} finally {
if (null != writer) {
try {
- writer.flush();
- } catch (IOException e) {
- }
- try {
writer.close();
- } catch (IOException e) {
+ } catch (IOException ignored) {
+ // ignored
}
}
}