Merge pull request #1022 from gitblit/974-in-browser-doc-editor

Paul Martin

2016-03-28 33f3580f8f4499ac9cd4812872c94fcdd81a5829

 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();

@@ -296,7 +305,7 @@
      Path exactBase = Paths.get(getExactFile(basePath).toURI());

      Path exactPath = Paths.get(getExactFile(path).toURI());

      if (exactPath.startsWith(exactBase)) {

         return exactBase.relativize(exactPath).toString();

         return exactBase.relativize(exactPath).toString().replace('\\', '/');

      }

      // no relative relationship

      return null;