From ffd5bf1970b4f1a179f6376ff1156b0cf242b096 Mon Sep 17 00:00:00 2001 From: snowleo Date: Mon, 21 Mar 2011 12:51:26 +0000 Subject: [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 --- Essentials/src/com/earth2me/essentials/EssentialsConf.java | 5 +++-- 1 file 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) { -- cgit v1.2.3