summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-04-11 13:40:22 -0400
committerJames Moger <james.moger@gitblit.com>2014-04-11 13:48:14 -0400
commitec53f7c3792372bfeb449126594076d1bcf5f084 (patch)
tree71569039a0bba0be3c4a3119c32ac791ee1b2418 /src/main/java
parent70aeceb0e61c03bd495921865715774c7e99663a (diff)
downloadgitblit-ec53f7c3792372bfeb449126594076d1bcf5f084.tar.gz
gitblit-ec53f7c3792372bfeb449126594076d1bcf5f084.zip
Ensure plugins dir is created before pf4j is instantiated
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/gitblit/manager/PluginManager.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/com/gitblit/manager/PluginManager.java b/src/main/java/com/gitblit/manager/PluginManager.java
index 9cefc88d..1c26fa15 100644
--- a/src/main/java/com/gitblit/manager/PluginManager.java
+++ b/src/main/java/com/gitblit/manager/PluginManager.java
@@ -80,6 +80,7 @@ public class PluginManager implements IPluginManager, PluginStateListener {
public PluginManager(IRuntimeManager runtimeManager) {
File dir = runtimeManager.getFileOrFolder(Keys.plugins.folder, "${baseFolder}/plugins");
+ dir.mkdirs();
this.runtimeManager = runtimeManager;
this.pf4j = new DefaultPluginManager(dir);
}
@@ -229,11 +230,11 @@ public class PluginManager implements IPluginManager, PluginStateListener {
}
@Override
- public synchronized boolean refreshRegistry() {
+ public synchronized boolean refreshRegistry(boolean verifyChecksum) {
String dr = "http://gitblit.github.io/gitblit-registry/plugins.json";
String url = runtimeManager.getSettings().getString(Keys.plugins.registry, dr);
try {
- File file = download(url, true);
+ File file = download(url, verifyChecksum);
if (file != null && file.exists()) {
URL selfUrl = new URL(url.substring(0, url.lastIndexOf('/')));
// replace ${self} with the registry url
@@ -260,7 +261,7 @@ public class PluginManager implements IPluginManager, PluginStateListener {
File[] files = folder.listFiles(jsonFilter);
if (files == null || files.length == 0) {
// automatically retrieve the registry if we don't have a local copy
- refreshRegistry();
+ refreshRegistry(true);
files = folder.listFiles(jsonFilter);
}