James Moger
2014-04-11 ec53f7c3792372bfeb449126594076d1bcf5f084
Ensure plugins dir is created before pf4j is instantiated
1 files modified
7 ■■■■■ changed files
src/main/java/com/gitblit/manager/PluginManager.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/manager/PluginManager.java
@@ -80,6 +80,7 @@
    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 @@
    }
    @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 @@
        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);
        }