From f5d61417c3e359196b94c57d62b35c41669d7a63 Mon Sep 17 00:00:00 2001
From: Esteban Aliverti <esteban.aliverti@gmail.com>
Date: Mon, 20 Aug 2012 12:24:46 +0200
Subject: [PATCH] - Improved Messages ids for concurrent scenarios

---
 .../drools/mas/util/ACLMessageFactory.java    | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/drools-mas-util/src/main/java/org/drools/mas/util/ACLMessageFactory.java b/drools-mas-util/src/main/java/org/drools/mas/util/ACLMessageFactory.java
index 918cae2..f197fb9 100644
--- a/drools-mas-util/src/main/java/org/drools/mas/util/ACLMessageFactory.java
+++ b/drools-mas-util/src/main/java/org/drools/mas/util/ACLMessageFactory.java
@@ -22,6 +22,8 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
 import org.drools.mas.ACLMessage;
 import org.drools.mas.Act;
 import org.drools.mas.AgentID;
@@ -60,9 +62,9 @@
  */
 public class ACLMessageFactory implements Serializable {
 
-    private static long idCounter = 0;
-    private static long convoCounter = 0;
-
+    private static AtomicLong idCounter = new AtomicLong();
+    private static AtomicLong convCounter  = new AtomicLong();
+    
     private static ACLMessageFactory instance;
     
     public static ACLMessageFactory getInstance(){
@@ -72,12 +74,12 @@ public static ACLMessageFactory getInstance(){
         return instance;
     }
     
-    private String newId() {
-        return "" + (idCounter++);
+    private long newId() {
+        return idCounter.incrementAndGet();
     }
 
-    private String newConversationId() {
-        return "" + (convoCounter++);
+    private long newConversationId() {
+        return convCounter.incrementAndGet();
     }
     private Encodings defaultEncoding = Encodings.XML;
 
@@ -94,20 +96,20 @@ public ACLMessageFactory(Encodings defEncoding) {
     }
 
     public ACLMessage newMessage() {
-        return new ACLMessage( newId() );
+        return new ACLMessage( UUID.randomUUID().toString()+"-"+newId() );
     }
 
     protected ACLMessage newMessage( String sender, String receiver ) {
 
         ACLMessage msg = new ACLMessage();
 
-        msg.setConversationId( newConversationId() );
-
         AgentID senderAgent = new AgentID();
         senderAgent.setName( sender );
         msg.setSender( senderAgent );
 
-        msg.setId( newId() + senderAgent.toString() );
+        msg.setConversationId( senderAgent.toString() +"-"+ newConversationId());
+        
+        msg.setId( senderAgent.toString() +"-"+ newId());
 
         List<AgentID> recSet = msg.getReceiver();
         AgentID receiverAgent = new AgentID();
@@ -121,7 +123,7 @@ protected ACLMessage newMessage( String sender, String receiver ) {
 
     protected ACLMessage createReply(ACLMessage inMsg, AgentID sender) {
 
-        ACLMessage msg = new ACLMessage(newId());
+        ACLMessage msg = newMessage();
         msg.setEncoding(inMsg.getEncoding());
         msg.setSender(sender);