From 8a8436f73d4c4edd10b43313b724f32ccb7b957e Mon Sep 17 00:00:00 2001
From: Abhishek Koneru <akoneru@redhat.com>
Date: Wed, 20 Jun 2012 13:56:57 -0400
Subject: Fixes for Coverity issues of type Resource Leaks - Remaining

---
 .../com/netscape/cmscore/util/FileAsString.java    | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'base/common/src/com/netscape/cmscore/util')

diff --git a/base/common/src/com/netscape/cmscore/util/FileAsString.java b/base/common/src/com/netscape/cmscore/util/FileAsString.java
index 7853346f5..ea8fb796d 100644
--- a/base/common/src/com/netscape/cmscore/util/FileAsString.java
+++ b/base/common/src/com/netscape/cmscore/util/FileAsString.java
@@ -52,16 +52,19 @@ public class FileAsString {
         BufferedReader br = createBufferedReader(mFilename);
         StringBuffer buf = new StringBuffer();
         int bytesread = 0;
-
-        do {
-            char cbuf[] = new char[16];
-
-            bytesread = br.read(cbuf, 0, cbuf.length);
-            if (bytesread > 0) {
-                buf.append(cbuf, 0, bytesread);
-            }
-        } while (bytesread != -1);
-        br.close();
+        try {
+            do {
+                char cbuf[] = new char[16];
+
+                bytesread = br.read(cbuf, 0, cbuf.length);
+                if (bytesread > 0) {
+                    buf.append(cbuf, 0, bytesread);
+                }
+            } while (bytesread != -1);
+        } finally {
+            if (br != null)
+                br.close();
+        }
 
         fileContents = new String(buf);
     }
-- 
cgit