commit 727884ebea3b213170add79491e104fc4ce2d8c6
author David Pursehouse <david.pursehouse@sonymobile.com> Thu Jun 25 02:15:53 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 25 02:15:54 2015 +0000
tree 26b7dfb38bef8331c691fca220cc874479e81936
parent 45ce6b663dd75baf87775ceb5b1cf01faeb96dce
parent 9f626a54229edbf5db42d3648892c7ecd163562f

Merge "Simplify test label to match other plugins' test label"

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 93f75a3..07a67ac 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serverconfig/ServerConfigServlet.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serverconfig/ServerConfigServlet.java
@@ -70,11 +70,11 @@
     this.webSession = webSession;
     this.auditService = auditService;
     this.pluginName = pluginName;
-    this.site_path = sitePaths.site_path;
-    this.etc_dir = sitePaths.etc_dir;
-    this.static_dir = sitePaths.static_dir;
+    this.site_path = sitePaths.site_path.toFile();
+    this.etc_dir = sitePaths.etc_dir.toFile();
+    this.static_dir = sitePaths.static_dir.toFile();
     try {
-      this.gerrit_config_path = sitePaths.gerrit_config.getCanonicalPath();
+      this.gerrit_config_path = sitePaths.gerrit_config.toFile().getCanonicalPath();
     } catch (IOException e) {
       throw new RuntimeException(e);
     }