summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/wicket/GitBlitWebApp.java
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-05-07 15:37:03 -0400
committerJames Moger <james.moger@gitblit.com>2014-05-07 15:37:03 -0400
commit0ee8041f980dab7fee723a326fa2a2f5d1fea054 (patch)
treeb5c14595cbdec5b089f57b38d67a457c47184f20 /src/main/java/com/gitblit/wicket/GitBlitWebApp.java
parent3b23dcdde4ef55927e45e56596e7023ce2cf9424 (diff)
downloadgitblit-0ee8041f980dab7fee723a326fa2a2f5d1fea054.tar.gz
gitblit-0ee8041f980dab7fee723a326fa2a2f5d1fea054.zip
Fix class loading failure when there are no STARTED plugins
Diffstat (limited to 'src/main/java/com/gitblit/wicket/GitBlitWebApp.java')
-rw-r--r--src/main/java/com/gitblit/wicket/GitBlitWebApp.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java
index d3aa62fd..7291d039 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java
@@ -25,6 +25,7 @@ import org.apache.wicket.Application;
import org.apache.wicket.Request;
import org.apache.wicket.Response;
import org.apache.wicket.Session;
+import org.apache.wicket.application.IClassResolver;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.protocol.http.WebApplication;
@@ -226,7 +227,8 @@ public class GitBlitWebApp extends WebApplication implements GitblitWicketApp {
}
// customize the Wicket class resolver to load from plugins
- PluginClassResolver classResolver = new PluginClassResolver(pluginManager);
+ IClassResolver coreResolver = getApplicationSettings().getClassResolver();
+ PluginClassResolver classResolver = new PluginClassResolver(coreResolver, pluginManager);
getApplicationSettings().setClassResolver(classResolver);
getMarkupSettings().setDefaultMarkupEncoding("UTF-8");