From 1126a1be1aa4291a54ec200d41bfcc26ce02f8f3 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 22 Sep 2011 19:52:01 +0200
Subject: [PATCH] fix possible NullPointerException

---
 .../sonia/scm/repository/RepositoryBrowserUtil.java  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryBrowserUtil.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryBrowserUtil.java
index c9a553c26d..568c5f0b3a 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryBrowserUtil.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryBrowserUtil.java
@@ -50,6 +50,7 @@ import sonia.scm.util.AssertUtil;
 
 import java.io.IOException;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -158,7 +159,16 @@ public class RepositoryBrowserUtil extends CacheClearHook
     if (result == null)
     {
       result = browser.getResult(revision, path);
-      sort(result);
+
+      if (result != null)
+      {
+        sort(result);
+      }
+      else
+      {
+        result = new BrowserResult();
+      }
+
       cache.put(key, result);
     }
     else if (logger.isDebugEnabled())