add helper method

JumpMind · May 23, 2012 · 9ad9469 · 9ad9469
1 parent 952c274
commit 9ad9469
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/model/NodeCommunication.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/model/NodeCommunication.java
@@ -144,5 +144,21 @@ public Node getNode() {
     public boolean isLocked() {
         return lockTime != null;
     }
+
+    public long getAverageSuccessPeriod() {
+        if (totalSuccessCount > 0 && totalSuccessMillis > 0) {
+            return totalSuccessMillis/totalSuccessCount;
+        } else {
+            return 0l;
+        }
+    }
+
+    public long getAverageFailurePeriod() {
+        if (totalFailCount > 0 && totalFailMillis > 0) {
+            return totalFailMillis/totalFailCount;
+        } else {
+            return 0l;
+        }
+    }    
 
 }
diff --git a/...ore/src/main/java/org/jumpmind/symmetric/service/impl/NodeCommunicationServiceSqlMap.java b/...ore/src/main/java/org/jumpmind/symmetric/service/impl/NodeCommunicationServiceSqlMap.java
@@ -10,7 +10,7 @@ public NodeCommunicationServiceSqlMap(IDatabasePlatform platform,
             Map<String, String> replacementTokens) {
         super(platform, replacementTokens);
 
-        putSql("clearLocksOnRestartSql", "update $(node_communication) set lock_time=null where locking_server_id=?");
+        putSql("clearLocksOnRestartSql", "update $(node_communication) set lock_time=null where locking_server_id=? and lock_time is not null");
 
         putSql("selectNodeCommunicationSql",
                 "select * from $(node_communication) where communication_type=? order by last_lock_time");