commit c749cd481878e2e81e30d6b9e2cf6d4c2dfe78b0
author Saša Živkov <zivkov@gmail.com> Wed Oct 01 09:09:22 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 01 09:09:22 2014 +0000
tree a363762224f9bc44e573fc302b1e1e52274ebf0d
parent efc95ba2a2324fabc265d819dbd4f426ca2bb4a3
parent 24fd520675f2a7c0b72865d563e94565183d5a6f

Merge "Make tests executable with BUCK"

src/main/java/com/googlesource/gerrit/plugins/serverconfig/ServerConfigServlet.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/serverconfig/ServerConfigServlet.java b/src/main/java/com/googlesource/gerrit/plugins/serverconfig/ServerConfigServlet.java
index da7c9c8..f0007d5 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serverconfig/ServerConfigServlet.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serverconfig/ServerConfigServlet.java
@@ -21,12 +21,12 @@
 import com.google.gerrit.audit.AuditEvent;
 import com.google.gerrit.audit.AuditService;
 import com.google.gerrit.extensions.annotations.PluginName;
+import com.google.gerrit.extensions.registration.DynamicItem;
 import com.google.gerrit.httpd.WebSession;
 import com.google.gerrit.server.CurrentUser;
 import com.google.gerrit.server.config.SitePaths;
 import com.google.gerrit.server.util.TimeUtil;
 import com.google.inject.Inject;
-import com.google.inject.Provider;
 import com.google.inject.Singleton;
 
 import org.eclipse.jgit.diff.RawText;
@@ -61,11 +61,11 @@
   private final File static_dir;
   private final String gerrit_config_path;
   private final AuditService auditService;
-  private final Provider<WebSession> webSession;
+  private final DynamicItem<WebSession> webSession;
   private final String pluginName;
 
   @Inject
-  ServerConfigServlet(SitePaths sitePaths, Provider<WebSession> webSession,
+  ServerConfigServlet(SitePaths sitePaths, DynamicItem<WebSession> webSession,
       AuditService auditService, @PluginName String pluginName) {
     this.webSession = webSession;
     this.auditService = auditService;