Fix GITBLIT_HOME environment variable baseFolder support

diff --git a/src/main/java/com/gitblit/servlet/GitblitContext.java b/src/main/java/com/gitblit/servlet/GitblitContext.java
index fcc702bbedc137c50c39639abc1a97b5000147e0..64d68e773facf96ff94de6149d6629ed22129868 100644 (file)
--- a/src/main/java/com/gitblit/servlet/GitblitContext.java
+++ b/src/main/java/com/gitblit/servlet/GitblitContext.java
@@ -317,9 +317,9 @@ public class GitblitContext extends DaggerContext {
                        logger.error("");
                }
 
-               String baseFromJndi = lookupBaseFolderFromJndi();
-               if (!StringUtils.isEmpty(baseFromJndi)) {
-                       path = baseFromJndi;
+               String externalBase = System.getProperty("GITBLIT_HOME", lookupBaseFolderFromJndi());
+               if (!StringUtils.isEmpty(externalBase)) {
+                       path = externalBase;
                }
 
                File base = com.gitblit.utils.FileUtils.resolveParameter(Constants.contextFolder$, contextFolder, path);