diff --git a/symmetric-android/src/main/java/org/jumpmind/symmetric/android/AndroidSymmetricEngine.java b/symmetric-android/src/main/java/org/jumpmind/symmetric/android/AndroidSymmetricEngine.java index 0fec4208ee..f2df410f33 100644 --- a/symmetric-android/src/main/java/org/jumpmind/symmetric/android/AndroidSymmetricEngine.java +++ b/symmetric-android/src/main/java/org/jumpmind/symmetric/android/AndroidSymmetricEngine.java @@ -45,6 +45,7 @@ import org.jumpmind.symmetric.route.DataGapRouteReader; import org.jumpmind.symmetric.route.IDataToRouteReader; import org.jumpmind.symmetric.service.IClusterService; +import org.jumpmind.symmetric.service.IConfigurationService; import org.jumpmind.symmetric.service.IExtensionService; import org.jumpmind.symmetric.service.INodeCommunicationService; import org.jumpmind.symmetric.service.INodeService; @@ -159,20 +160,21 @@ protected IDataToRouteReader startReading(ChannelRouterContext context) { @Override protected INodeCommunicationService buildNodeCommunicationService(IClusterService clusterService, INodeService nodeService, - IParameterService parameterService, ISymmetricDialect symmetricDialect) { - return new AndroidNodeCommunicationService(clusterService, nodeService, parameterService, symmetricDialect); + IParameterService parameterService, IConfigurationService configurationService, ISymmetricDialect symmetricDialect) { + return new AndroidNodeCommunicationService(clusterService, nodeService, parameterService, configurationService, symmetricDialect); } class AndroidNodeCommunicationService extends NodeCommunicationService { public AndroidNodeCommunicationService(IClusterService clusterService, INodeService nodeService, - IParameterService parameterService, ISymmetricDialect symmetricDialect) { - super(clusterService, nodeService, parameterService, symmetricDialect); + IParameterService parameterService, IConfigurationService configurationService, ISymmetricDialect symmetricDialect) { + super(clusterService, nodeService, parameterService, configurationService, symmetricDialect); } @Override public boolean execute(NodeCommunication nodeCommunication, RemoteNodeStatuses statuses, INodeCommunicationExecutor executor) { + final RemoteNodeStatus status = statuses.add(nodeCommunication.getNodeId()); long ts = System.currentTimeMillis(); boolean failed = false; diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/RemoteNodeStatuses.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/RemoteNodeStatuses.java index e526a1c325..b22b48b897 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/RemoteNodeStatuses.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/RemoteNodeStatuses.java @@ -76,6 +76,15 @@ public RemoteNodeStatus add(String nodeId, String channelId) { } return status; } + + public RemoteNodeStatus add(String nodeId) { + RemoteNodeStatus status = null; + if (nodeId != null) { + status = new RemoteNodeStatus(nodeId, null, channels); + add(status); + } + return status; + } public boolean isComplete() { boolean complete = false; diff --git a/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractDataLoaderServiceTest.java b/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractDataLoaderServiceTest.java index bc86f918ae..a58f456507 100644 --- a/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractDataLoaderServiceTest.java +++ b/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractDataLoaderServiceTest.java @@ -552,7 +552,8 @@ protected void testSimple(String dmlType, String[] values, String[] expectedValu protected void load(ByteArrayOutputStream out) throws Exception { ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); getTransportManager().setIncomingTransport(new InternalIncomingTransport(in)); - getDataLoaderService().loadDataFromPull(client); + String channelId = null; + getDataLoaderService().loadDataFromPull(client, channelId); } protected IncomingBatch.Status findIncomingBatchStatus(int batchId, String nodeId) {