diff options
| author | James Moger <james.moger@gitblit.com> | 2014-09-24 13:48:08 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-09-24 13:48:08 -0400 |
| commit | 2fb843db2702f5f6d1df784d53dd6cbba286f4f3 (patch) | |
| tree | 2e455a6e910d8dd7291d9e9b3f28c67e3c78a4eb /src/main/java/com/gitblit/servlet | |
| parent | 5785497bca7d8c18b76d9d18333a1ece0372a8e6 (diff) | |
| parent | 4b9b3c972681db34b63e94f3df51627c2da62cf3 (diff) | |
| download | gitblit-2fb843db2702f5f6d1df784d53dd6cbba286f4f3.tar.gz gitblit-2fb843db2702f5f6d1df784d53dd6cbba286f4f3.zip | |
Merge branch 'ticket/185' into develop
Diffstat (limited to 'src/main/java/com/gitblit/servlet')
| -rw-r--r-- | src/main/java/com/gitblit/servlet/GitblitContext.java | 6 |
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); |