Fix 2 possible NullPointer occurences

marco

2015-10-17 1aec17636d8c548257cb307f8cc1e41354e00421

Fix 2 possible NullPointer occurences

 src/main/java/com/gitblit/manager/FederationManager.java

@@ -367,6 +367,10 @@
                            && 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,

 src/main/java/com/gitblit/utils/FileUtils.java

@@ -140,9 +140,10 @@
    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 @@
            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();