#302 Update lock logic

dvoraka · Jan 8, 2018 · a00dc90 · a00dc90
1 parent 5988837
commit a00dc90
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/common/src/main/java/dvoraka/avservice/common/helper/replication/ReplicationHelper.java b/common/src/main/java/dvoraka/avservice/common/helper/replication/ReplicationHelper.java
@@ -118,4 +118,18 @@ default ReplicationMessage createDiagnosticsMessage(String fromNode) {
                 .toId(fromNode)
                 .build();
     }
+
+    default boolean isUnicast(ReplicationMessage message) {
+        return message.getRouting() == MessageRouting.UNICAST;
+    }
+
+    default boolean isCommand(ReplicationMessage message, Command... commands) {
+        for (Command command : commands) {
+            if (message.getCommand() == command) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/storage/src/main/java/dvoraka/avservice/storage/replication/DefaultRemoteLock.java b/storage/src/main/java/dvoraka/avservice/storage/replication/DefaultRemoteLock.java
@@ -4,7 +4,6 @@
 import dvoraka.avservice.client.service.response.ReplicationMessageList;
 import dvoraka.avservice.client.service.response.ReplicationResponseClient;
 import dvoraka.avservice.common.data.Command;
-import dvoraka.avservice.common.data.replication.MessageRouting;
 import dvoraka.avservice.common.data.replication.ReplicationMessage;
 import dvoraka.avservice.common.data.replication.ReplicationStatus;
 import dvoraka.avservice.common.helper.WaitingHelper;
@@ -293,20 +292,21 @@ public void setMaxResponseTime(int maxResponseTime) {
 
     @Override
     public void onMessage(ReplicationMessage message) {
+
+        if (!isRunning()) {
+            return;
+        }
+
         // input filtering
-        if (message.getRouting() == MessageRouting.UNICAST
-                || message.getCommand() == Command.DISCOVER
-                || message.getCommand() == Command.EXISTS) {
+        if (isUnicast(message) || isCommand(message, Command.DISCOVER, Command.EXISTS)) {
             return;
         }
 
         log.debug("On message {}: {}", idString, message);
 
         switch (message.getCommand()) {
             case SEQUENCE:
-                if (getSequence() != NOT_INITIALIZED) {
-                    serviceClient.sendMessage(createSequenceReply(message, nodeId, getSequence()));
-                }
+                sequence(message);
                 break;
 
             case LOCK:
@@ -327,6 +327,10 @@ public void onMessage(ReplicationMessage message) {
         }
     }
 
+    private void sequence(ReplicationMessage message) {
+        serviceClient.sendMessage(createSequenceReply(message, nodeId, getSequence()));
+    }
+
     private void lock(ReplicationMessage message) {
         if (getSequence() == message.getSequence() && lockingLock.tryLock()) {