Skip to content
Snippets Groups Projects
Commit 5cd9b202 authored by Ramin Yaghoubzadeh Torky's avatar Ramin Yaghoubzadeh Torky
Browse files

Java: using concurrent hash maps; Py: Added new ivy files

parent ea037e20
No related branches found
No related tags found
No related merge requests found
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
package ipaaca; package ipaaca;
import java.util.HashMap; import java.util.concurrent.ConcurrentHashMap;
/** /**
* An IUStore maps an IUid to an IU * An IUStore maps an IUid to an IU
...@@ -40,7 +40,7 @@ import java.util.HashMap; ...@@ -40,7 +40,7 @@ import java.util.HashMap;
* *
* @param <X> type of AbstractIU stored in the store * @param <X> type of AbstractIU stored in the store
*/ */
public class IUStore<X extends AbstractIU> extends HashMap<String, X> public class IUStore<X extends AbstractIU> extends ConcurrentHashMap<String, X>
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }
...@@ -269,8 +269,16 @@ public class InputBuffer extends Buffer ...@@ -269,8 +269,16 @@ public class InputBuffer extends Buffer
if (event.getData() instanceof RemoteMessageIU) if (event.getData() instanceof RemoteMessageIU)
{ {
RemoteMessageIU rm = (RemoteMessageIU) event.getData(); RemoteMessageIU rm = (RemoteMessageIU) event.getData();
if (messageStore.containsKey(rm.getUid())) {
logger.warn("Spurious RemoteMessage event: already got this UID: "+rm.getUid());
return;
}
//logger.info("Adding Message "+rm.getUid());
messageStore.put(rm.getUid(), rm); messageStore.put(rm.getUid(), rm);
//logger.info("Calling handlers for Message "+rm.getUid());
callIuEventHandlers(rm.getUid(),false, IUEventType.MESSAGE, rm.getCategory()); callIuEventHandlers(rm.getUid(),false, IUEventType.MESSAGE, rm.getCategory());
//logger.info("Removing Message "+rm.getUid());
messageStore.remove(rm.getUid()); messageStore.remove(rm.getUid());
} }
else if (event.getData() instanceof RemotePushIU) else if (event.getData() instanceof RemotePushIU)
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
<dependencies> <dependencies>
<dependency org="google" name="protobuf-python" rev="latest.release"/> <dependency org="google" name="protobuf-python" rev="latest.release"/>
<dependency org="rsb" name="rsb-python" rev="latest.release"/> <dependency org="rsb" name="rsb-python" rev="latest.release"/>
<dependency org="spread" name="spread" rev="latest.release"/>
</dependencies> </dependencies>
</ivy-module> </ivy-module>
...@@ -3,5 +3,7 @@ ...@@ -3,5 +3,7 @@
<dependencies> <dependencies>
<dependency org="hamcrest" name="hamcrest-python" rev="latest.release"/> <dependency org="hamcrest" name="hamcrest-python" rev="latest.release"/>
<dependency org="mockito" name="mockito-python" rev="latest.release" /> <dependency org="mockito" name="mockito-python" rev="latest.release" />
<dependency org="nose" name="nose" rev="latest.release" />
</dependencies> </dependencies>
</ivy-module> </ivy-module>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment