From ec53f7c3792372bfeb449126594076d1bcf5f084 Mon Sep 17 00:00:00 2001 From: James Moger Date: Fri, 11 Apr 2014 13:40:22 -0400 Subject: Ensure plugins dir is created before pf4j is instantiated --- src/main/java/com/gitblit/manager/PluginManager.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/java') 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); } -- cgit v1.2.3