0001989: Switching cluster locks off causes initialization error

JumpMind · Sep 23, 2014 · 27736a2 · 27736a2
1 parent 4594704
commit 27736a2
Showing 1 changed file with 22 additions and 22 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ClusterService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ClusterService.java
@@ -77,11 +77,13 @@ public void init() {
         sqlTemplate.update(getSql("initLockSql"), new Object[] { getServerId() });
 
         Map<String, Lock> allLocks = findLocks();
-        for (String action : new String[] { ROUTE, PULL, PUSH, HEARTBEAT, PURGE_INCOMING, PURGE_OUTGOING, PURGE_STATISTICS, SYNCTRIGGERS,
-                PURGE_DATA_GAPS, STAGE_MANAGEMENT, WATCHDOG, STATISTICS, FILE_SYNC_PULL, FILE_SYNC_PUSH, FILE_SYNC_TRACKER,
-                INITIAL_LOAD_EXTRACT }) {
-            if (allLocks.get(action) == null) {
-                initLockTable(action, TYPE_CLUSTER);
+        if (isClusteringEnabled()) {
+            for (String action : new String[] { ROUTE, PULL, PUSH, HEARTBEAT, PURGE_INCOMING, PURGE_OUTGOING, PURGE_STATISTICS, SYNCTRIGGERS,
+                    PURGE_DATA_GAPS, STAGE_MANAGEMENT, WATCHDOG, STATISTICS, FILE_SYNC_PULL, FILE_SYNC_PUSH, FILE_SYNC_TRACKER,
+                    INITIAL_LOAD_EXTRACT }) {
+                if (allLocks.get(action) == null) {
+                    initLockTable(action, TYPE_CLUSTER);
+                }
             }
         }
 
@@ -188,23 +190,21 @@ protected boolean lockWait(final String action, final String lockType, long wait
 
     public Map<String, Lock> findLocks() {
         final Map<String, Lock> locks = new HashMap<String, Lock>();
-        if (isClusteringEnabled()) {
-            sqlTemplate.query(getSql("findLocksSql"), new ISqlRowMapper<Lock>() {
-                public Lock mapRow(Row rs) {
-                    Lock lock = new Lock();
-                    lock.setLockAction(rs.getString("lock_action"));
-                    lock.setLockType(rs.getString("lock_type"));
-                    lock.setLockingServerId(rs.getString("locking_server_id"));
-                    lock.setLockTime(rs.getDateTime("lock_time"));
-                    lock.setSharedCount(rs.getInt("shared_count"));
-                    lock.setSharedEnable(rs.getBoolean("shared_enable"));
-                    lock.setLastLockingServerId(rs.getString("last_locking_server_id"));
-                    lock.setLastLockTime(rs.getDateTime("last_lock_time"));
-                    locks.put(lock.getLockAction(), lock);
-                    return lock;
-                }
-            });
-        }
+        sqlTemplate.query(getSql("findLocksSql"), new ISqlRowMapper<Lock>() {
+            public Lock mapRow(Row rs) {
+                Lock lock = new Lock();
+                lock.setLockAction(rs.getString("lock_action"));
+                lock.setLockType(rs.getString("lock_type"));
+                lock.setLockingServerId(rs.getString("locking_server_id"));
+                lock.setLockTime(rs.getDateTime("lock_time"));
+                lock.setSharedCount(rs.getInt("shared_count"));
+                lock.setSharedEnable(rs.getBoolean("shared_enable"));
+                lock.setLastLockingServerId(rs.getString("last_locking_server_id"));
+                lock.setLastLockTime(rs.getDateTime("last_lock_time"));
+                locks.put(lock.getLockAction(), lock);
+                return lock;
+            }
+        });
         return locks;
     }