Merge pull request #381 from OpenSRP/master_issue379

Master: Fix issue of duplicate server versions

opensrp-core/src/main/java/org/opensrp/service/formSubmission/EventsListener.java

@@ -120,20 +120,22 @@ public void processEvent(MotechEvent motechEvent) {
 		}
 	}
 
-	private void addServerVersion() {
+	private synchronized void addServerVersion() {
 		try {
 			List<Client> clients = allClients.findByEmptyServerVersion();
+			long currentTimeMillis = getCurrentMilliseconds();
 			while (clients != null && !clients.isEmpty()) {
 				for (Client client : clients) {
 					try {
 						Thread.sleep(1);
-						client.setServerVersion(getCurrentMilliseconds());
+						client.setServerVersion(currentTimeMillis);
 						allClients.update(client);
 						logger.debug("Add server_version: found new client " + client.getBaseEntityId());
 					}
 					catch (InterruptedException e) {
 						logger.error("", e);
 					}
+					currentTimeMillis += 1;
 				}
 				clients = allClients.findByEmptyServerVersion();
 			}
@@ -143,15 +145,16 @@ private void addServerVersion() {
 				for (Event event : events) {
 					try {
 						Thread.sleep(1);
-						event=eventService.processOutOfArea(event);
-						event.setServerVersion(getCurrentMilliseconds());
+						event = eventService.processOutOfArea(event);
+						event.setServerVersion(currentTimeMillis);
 						allEvents.update(event);
 
 						logger.debug("Add server_version: found new event " + event.getBaseEntityId());
 					}
 					catch (InterruptedException e) {
 						logger.error("", e);
 					}
+					currentTimeMillis += 1;
 				}
 
 				events = allEvents.findByEmptyServerVersion();