Use FileUtil#lastModified to avoid throwing IOExceptions
Change-Id: Iee784e71b8a98997dd1caab85cb1d52865e6e224
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/AutoReloadConfigDecorator.java b/src/main/java/com/googlesource/gerrit/plugins/replication/AutoReloadConfigDecorator.java
index ba21743..835e5fb 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/AutoReloadConfigDecorator.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/AutoReloadConfigDecorator.java
@@ -13,6 +13,7 @@
// limitations under the License.
package com.googlesource.gerrit.plugins.replication;
+import com.google.gerrit.common.FileUtil;
import com.google.gerrit.server.PluginUser;
import com.google.gerrit.server.account.GroupBackend;
import com.google.gerrit.server.config.SitePaths;
@@ -27,7 +28,6 @@
import org.slf4j.LoggerFactory;
import java.io.IOException;
-import java.nio.file.Files;
import java.util.List;
@Singleton
@@ -62,9 +62,8 @@
this.workQueue = workQueue;
}
- private static long getLastModified(ReplicationFileBasedConfig cfg)
- throws IOException {
- return Files.getLastModifiedTime(cfg.getCfgPath()).toMillis();
+ private static long getLastModified(ReplicationFileBasedConfig cfg) {
+ return FileUtil.lastModified(cfg.getCfgPath());
}
private ReplicationFileBasedConfig loadConfig()
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/AutoReloadSecureCredentialsFactoryDecorator.java b/src/main/java/com/googlesource/gerrit/plugins/replication/AutoReloadSecureCredentialsFactoryDecorator.java
index 5d5ca78..3a0cc3f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/AutoReloadSecureCredentialsFactoryDecorator.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/AutoReloadSecureCredentialsFactoryDecorator.java
@@ -11,8 +11,11 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
+
package com.googlesource.gerrit.plugins.replication;
+import static com.google.gerrit.common.FileUtil.lastModified;
+
import com.google.gerrit.server.config.SitePaths;
import com.google.inject.Inject;
@@ -45,11 +48,11 @@
this.secureCredentialsFactoryLoadTs = getSecureConfigLastEditTs();
}
- private long getSecureConfigLastEditTs() throws IOException {
+ private long getSecureConfigLastEditTs() {
if (!Files.exists(site.secure_config)) {
return 0L;
}
- return Files.getLastModifiedTime(site.secure_config).toMillis();
+ return lastModified(site.secure_config);
}
@Override
@@ -69,8 +72,7 @@
return secureCredentialsFactory.get().create(remoteName);
}
-
- private boolean needsReload() throws IOException {
+ private boolean needsReload() {
return config.getConfig().getBoolean("gerrit", "autoReload", false) &&
getSecureConfigLastEditTs() != secureCredentialsFactoryLoadTs;
}