James Moger
2013-01-07 11573e6b872c96bd07560ec67a97ac758548baba
Fixed NPE when recursively calculating a folder size with a named pipe
2 files modified
19 ■■■■ changed files
docs/04_releases.mkd 1 ●●●● patch | view | raw | blame | history
src/com/gitblit/utils/FileUtils.java 18 ●●●●● patch | view | raw | blame | history
docs/04_releases.mkd
@@ -6,6 +6,7 @@
#### fixes
- Fixed nullpointer on recursively calculating folder sizes when there is a named pipe in the hierarchy
- Fixed nullpointer on creating a repository with mixed case (issue 185)
- Fixed nullpointer when using web.allowForking = true && git.cacheRepositoryList = false (issue 182)
- Build project models from the repository model cache, when possible, to reduce page load time (issue 172)
src/com/gitblit/utils/FileUtils.java
@@ -176,19 +176,17 @@
    public static long folderSize(File directory) {
        if (directory == null || !directory.exists()) {
            return -1;
        }
        if (directory.isFile()) {
            return directory.length();
        }
        long length = 0;
        for (File file : directory.listFiles()) {
            if (file.isFile()) {
                length += file.length();
            } else {
        }
        if (directory.isDirectory()) {
            long length = 0;
            for (File file : directory.listFiles()) {
                length += folderSize(file);
            }
            return length;
        } else if (directory.isFile()) {
            return directory.length();
        }
        return length;
        return 0;
    }
    /**