AutoReloadRunnable: simplify the check for reloading
Simplify the boolean check of when the configuration must be
reloaded.
Change-Id: Idc83b0fc86dd81a632fd600b1116d9436971dcb5
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/AutoReloadRunnable.java b/src/main/java/com/googlesource/gerrit/plugins/replication/AutoReloadRunnable.java
index cd5bb8c..04db366 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/AutoReloadRunnable.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/AutoReloadRunnable.java
@@ -58,13 +58,15 @@
public synchronized void run() {
String pendingConfigVersion = loadedConfig.getVersion();
ReplicationQueue queue = replicationQueue.get();
- if (!loadedConfig.isShuttingDown()
- && !pendingConfigVersion.equals(loadedConfigVersion)
- && !pendingConfigVersion.equals(lastFailedConfigVersion)
- && queue.isRunning()
- && !queue.isReplaying()) {
- reload();
+ if (loadedConfig.isShuttingDown()
+ || pendingConfigVersion.equals(loadedConfigVersion)
+ || pendingConfigVersion.equals(lastFailedConfigVersion)
+ || !queue.isRunning()
+ || queue.isReplaying()) {
+ return;
}
+
+ reload();
}
synchronized void reload() {
