Issue #973 - batch_to_send_count not getting set properly unless you …

…have batches in error, plus other misc. REST enhancements.
JumpMind · Jan 7, 2013 · 905e0df · 905e0df
1 parent 5289aa4
commit 905e0df
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/job/PushHeartbeatListener.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/job/PushHeartbeatListener.java
@@ -49,10 +49,7 @@ public void heartbeat(Node me, Set<Node> children) {
             ISymmetricDialect symmetricDialect = engine.getSymmetricDialect();
             int outgoingErrorCount = engine.getOutgoingBatchService().countOutgoingBatchesInError();
             int outgoingUnsentCount = 0;
-            if (outgoingErrorCount > 0) {
-                // only set the unsent count if there are batches in error
-                outgoingUnsentCount = engine.getOutgoingBatchService().countOutgoingBatchesUnsent();
-            }
+            outgoingUnsentCount = engine.getOutgoingBatchService().countOutgoingBatchesUnsent();
             if (!parameterService.getExternalId().equals(me.getExternalId())
                     || !parameterService.getNodeGroupId().equals(me.getNodeGroupId())
                     || (parameterService.getSyncUrl() != null && !parameterService.getSyncUrl().equals(me.getSyncUrl()))

diff --git a/...re/src/test/resources/META-INF/maven/org.jumpmind.symmetric/symmetric-core/pom.properties b/...re/src/test/resources/META-INF/maven/org.jumpmind.symmetric/symmetric-core/pom.properties
@@ -1 +1 @@
-version=3.2.0
+version=3.2.2
diff --git a/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/RestService.java b/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/RestService.java
@@ -735,7 +735,7 @@ private Node nodeImpl(ISymmetricEngine engine) {
 
         INodeService nodeService = engine.getNodeService();
         Node xmlNode = new Node();
-        org.jumpmind.symmetric.model.Node modelNode = nodeService.findIdentity();
+        org.jumpmind.symmetric.model.Node modelNode = nodeService.findIdentity(false);
         List<NodeHost> nodeHosts = nodeService.findNodeHosts(modelNode.getNodeId());
         NodeSecurity nodeSecurity = nodeService.findNodeSecurity(modelNode.getNodeId());
         xmlNode.setName(modelNode.getNodeId());
@@ -754,7 +754,7 @@ private Node nodeImpl(ISymmetricEngine engine) {
         } else {
         	xmlNode.setRegistrationServer(false);
         }
-
+        xmlNode.setCreatedAtNodeId(modelNode.getCreatedAtNodeId());
         return xmlNode;
     }
 

diff --git a/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/model/Node.java b/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/model/Node.java
@@ -37,8 +37,17 @@ public class Node {
 	private boolean registered;
     private boolean initialLoaded;
     private boolean reverseInitialLoaded;
+    private String createdAtNodeId;
 
-    public boolean isReverseInitialLoaded() {
+    public String getCreatedAtNodeId() {
+		return createdAtNodeId;
+	}
+
+	public void setCreatedAtNodeId(String createdAtNodeId) {
+		this.createdAtNodeId = createdAtNodeId;
+	}
+
+	public boolean isReverseInitialLoaded() {
 		return reverseInitialLoaded;
 	}