commit 6ec3bcd2ae4d7c020c363ac6605f1248027c22dc
author David Pursehouse <david.pursehouse@sonymobile.com> Fri Dec 04 14:47:23 2015 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> Fri Dec 04 14:47:29 2015 +0900
tree f4969b8f496d17ca2985ad74c9ef873b20520844
parent f6fc6390084c96b7b46228d868cb03607149bd4c
parent e022f6e9f1401a4e58b74d3552c70d80afb7c3a7

Merge branch 'stable-2.11'

* stable-2.11:
  OnStartStop: Remove unused config member variable
  MotdFileBasedConfig: Remove declaration of unthrown exception
  Supports multi-line MOTD messages

Change-Id: I1ad2fee9ed30604897a47f9f24d7864895338aab

src/main/java/com/googlesource/gerrit/plugins/motd/MotdFileBasedConfig.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/motd/MotdFileBasedConfig.java b/src/main/java/com/googlesource/gerrit/plugins/motd/MotdFileBasedConfig.java
index 22d0236..af4c6ab 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/motd/MotdFileBasedConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/motd/MotdFileBasedConfig.java
@@ -44,7 +44,7 @@
   @Inject
   public MotdFileBasedConfig(final SitePaths site)
       throws ConfigInvalidException, IOException {
-    this.cfgPath = new File(site.etc_dir, "motd.config");
+    this.cfgPath = new File(site.etc_dir.toFile(), "motd.config");
     log.info("Loading configuration from " + cfgPath);
     this.config = new FileBasedConfig(cfgPath, FS.DETECTED);
     this.subnets = allSubnets();