summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/servlet/GitblitContext.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/gitblit/servlet/GitblitContext.java')
-rw-r--r--src/main/java/com/gitblit/servlet/GitblitContext.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/gitblit/servlet/GitblitContext.java b/src/main/java/com/gitblit/servlet/GitblitContext.java
index d8ccac37..a18a1431 100644
--- a/src/main/java/com/gitblit/servlet/GitblitContext.java
+++ b/src/main/java/com/gitblit/servlet/GitblitContext.java
@@ -340,9 +340,9 @@ public class GitblitContext extends GuiceServletContextListener {
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);