Fix 2 possible NullPointer occurences

2 files changed, 14 insertions, 1 deletions

diff --git a/src/main/java/com/gitblit/manager/FederationManager.java b/src/main/java/com/gitblit/manager/FederationManager.java
index f009c1c8..8f68733b 100644
--- 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 e7f01045..ad2509d0 100644
--- 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) {

 		StringBuilder sb = new StringBuilder();

 		InputStreamReader is = null;

+		BufferedReader reader = null;

 		try {

 			is = new InputStreamReader(new FileInputStream(file), Charset.forName("UTF-8"));

-			BufferedReader reader = new BufferedReader(is);

+			reader = new BufferedReader(is);

 			String line = null;

 			while ((line = reader.readLine()) != null) {

 				sb.append(line);

@@ -154,6 +155,14 @@ public class FileUtils {
 			System.err.println("Failed to read content of " + file.getAbsolutePath());

 			t.printStackTrace();

 		} finally {

+			if (reader != null){

+				try {

+					reader.close();

+				} catch (IOException ioe) {

+					System.err.println("Failed to close file " + file.getAbsolutePath());

+					ioe.printStackTrace();

+				}

+			}

 			if (is != null) {

 				try {

 					is.close();