summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-03-21 12:51:26 +0000
committersnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-03-21 12:51:26 +0000
commitffd5bf1970b4f1a179f6376ff1156b0cf242b096 (patch)
tree7aa534de42a1914a11e493224e1a1966014b108b
parent6a3fc060468404352831b398c57426ab00ef8260 (diff)
downloadEssentials-ffd5bf1970b4f1a179f6376ff1156b0cf242b096.tar
Essentials-ffd5bf1970b4f1a179f6376ff1156b0cf242b096.tar.gz
Essentials-ffd5bf1970b4f1a179f6376ff1156b0cf242b096.tar.lz
Essentials-ffd5bf1970b4f1a179f6376ff1156b0cf242b096.tar.xz
Essentials-ffd5bf1970b4f1a179f6376ff1156b0cf242b096.zip
[trunk] Fix NPE in EssentialsConf on closing the stream.
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@989 e251c2fe-e539-e718-e476-b85c1f46cddb
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsConf.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsConf.java b/Essentials/src/com/earth2me/essentials/EssentialsConf.java
index 616f39a6c..124dc6fd2 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsConf.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsConf.java
@@ -81,7 +81,6 @@ public class EssentialsConf extends Configuration
ostr.write(buffer, 0, length);
length = istr.read(buffer);
}
- ostr.close();
istr.close();
}
catch (IOException ex)
@@ -93,7 +92,9 @@ public class EssentialsConf extends Configuration
{
try
{
- ostr.close();
+ if (ostr != null) {
+ ostr.close();
+ }
}
catch (IOException ex)
{