refactoring: some findbugs cleanup

2 files changed, 10 insertions, 4 deletions

diff --git a/tests/src/cgeo/geocaching/test/mock/MockedCache.java b/tests/src/cgeo/geocaching/test/mock/MockedCache.java
index 21f67e6..352c34d 100644
--- a/tests/src/cgeo/geocaching/test/mock/MockedCache.java
+++ b/tests/src/cgeo/geocaching/test/mock/MockedCache.java
@@ -8,6 +8,7 @@ import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.utils.BaseUtils;
 
 import org.apache.commons.lang3.StringUtils;
+import org.mapsforge.core.IOUtils;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -54,9 +55,11 @@ public abstract class MockedCache implements ICache {
     }
 
     public static String readCachePage(final String geocode) {
+        InputStream is = null;
+        BufferedReader br = null;
         try {
-            final InputStream is = MockedCache.class.getResourceAsStream("/cgeo/geocaching/test/mock/" + geocode + ".html");
-            final BufferedReader br = new BufferedReader(new InputStreamReader(is), 150000);
+            is = MockedCache.class.getResourceAsStream("/cgeo/geocaching/test/mock/" + geocode + ".html");
+            br = new BufferedReader(new InputStreamReader(is), 150000);
 
             final StringBuilder buffer = new StringBuilder();
             String line;
@@ -65,10 +68,12 @@ public abstract class MockedCache implements ICache {
                 buffer.append(line).append('\n');
             }
 
-            br.close();
             return BaseUtils.replaceWhitespace(buffer.toString());
         } catch (IOException e) {
             e.printStackTrace();
+        } finally {
+            IOUtils.closeQuietly(is);
+            IOUtils.closeQuietly(br);
         }
         return null;
     }
diff --git a/tests/src/cgeo/geocaching/utils/MemorySubjectTest.java b/tests/src/cgeo/geocaching/utils/MemorySubjectTest.java
index 30e4f60..7b30180 100644
--- a/tests/src/cgeo/geocaching/utils/MemorySubjectTest.java
+++ b/tests/src/cgeo/geocaching/utils/MemorySubjectTest.java
@@ -19,7 +19,8 @@ public class MemorySubjectTest extends AndroidTestCase {
     private MemorySubject<Integer> memorySubject;
 
     @Override
-    public void setUp() {
+    public void setUp() throws Exception {
+        super.setUp();
         observer = new Observer();
         memorySubject = new MemorySubject<Integer>();
     }