From 6b76d4fb30104f08a7c6b33d7cf05fb71179f6de Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 04 Sep 2014 14:20:28 -0400 Subject: [PATCH] Merge branch 'ticket/151' into develop --- src/main/java/com/gitblit/wicket/GitBlitWebApp.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java index e09799d..036a05a 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java @@ -105,6 +105,8 @@ private final Provider<IPublicKeyManager> publicKeyManagerProvider; + private final Provider<ITicketService> ticketServiceProvider; + private final IStoredSettings settings; private final IRuntimeManager runtimeManager; @@ -130,6 +132,7 @@ @Inject public GitBlitWebApp( Provider<IPublicKeyManager> publicKeyManagerProvider, + Provider<ITicketService> ticketServiceProvider, IRuntimeManager runtimeManager, IPluginManager pluginManager, INotificationManager notificationManager, @@ -143,6 +146,7 @@ super(); this.publicKeyManagerProvider = publicKeyManagerProvider; + this.ticketServiceProvider = ticketServiceProvider; this.settings = runtimeManager.getSettings(); this.runtimeManager = runtimeManager; this.pluginManager = pluginManager; @@ -438,7 +442,7 @@ */ @Override public ITicketService tickets() { - return gitblit.getTicketService(); + return ticketServiceProvider.get(); } /* (non-Javadoc) -- Gitblit v1.9.1