Fix 2 possible NullPointer occurences

diff --git a/src/main/java/com/gitblit/manager/FederationManager.java b/src/main/java/com/gitblit/manager/FederationManager.java
index f009c1c8bacb6acccfea78d2e7cde8fc62698dce..8f68733b30a3e5348b4b026b9d72f43c404067c6 100644 (file)
--- a/src/main/java/com/gitblit/manager/FederationManager.java
+++ b/src/main/java/com/gitblit/manager/FederationManager.java
@@ -367,6 +367,10 @@ public class FederationManager implements IFederationManager {
                                                        && file.getName().toLowerCase().endsWith(Constants.PROPOSAL_EXT);
                                }
                        });
+                       if (files == null) {
+                               return list;
+                       }
+                               
                        for (File file : files) {
                                String json = com.gitblit.utils.FileUtils.readContent(file, null);
                                FederationProposal proposal = JsonUtils.fromJsonString(json,

diff --git a/src/main/java/com/gitblit/utils/FileUtils.java b/src/main/java/com/gitblit/utils/FileUtils.java
index e7f010455f01ea957b392051748ca156f89d8c0b..ad2509d0dd84b63ac02c60dc84f468036f842266 100644 (file)
--- a/src/main/java/com/gitblit/utils/FileUtils.java
+++ b/src/main/java/com/gitblit/utils/FileUtils.java
@@ -140,9 +140,10 @@ public class FileUtils {
        public static String readContent(File file, String lineEnding) {\r
                StringBuilder sb = new StringBuilder();\r
                InputStreamReader is = null;\r
+               BufferedReader reader = null;\r
                try {\r
                        is = new InputStreamReader(new FileInputStream(file), Charset.forName("UTF-8"));\r
-                       BufferedReader reader = new BufferedReader(is);\r
+                       reader = new BufferedReader(is);\r
                        String line = null;\r
                        while ((line = reader.readLine()) != null) {\r
                                sb.append(line);\r
@@ -154,6 +155,14 @@ public class FileUtils {
                        System.err.println("Failed to read content of " + file.getAbsolutePath());\r
                        t.printStackTrace();\r
                } finally {\r
+                       if (reader != null){\r
+                               try {\r
+                                       reader.close();\r
+                               } catch (IOException ioe) {\r
+                                       System.err.println("Failed to close file " + file.getAbsolutePath());\r
+                                       ioe.printStackTrace();\r
+                               }\r
+                       }\r
                        if (is != null) {\r
                                try {\r
                                        is.close();\r