From 3e0238c339092222ebcbcc9738d450bae390ae40 Mon Sep 17 00:00:00 2001
From: Ramin Yaghoubzadeh <ryaghoubzadeh@uni-bielefeld.de>
Date: Thu, 21 Nov 2013 14:49:54 +0100
Subject: [PATCH] ipaaca-java: Buffers get short unique IDs as in Py and C++
---
ipaacalib/java/src/ipaaca/Buffer.java | 7 ++++++-
ipaacalib/java/src/ipaaca/InputBuffer.java | 2 +-
ipaacalib/java/src/ipaaca/OutputBuffer.java | 2 +-
ipaacalib/python/src/ipaaca/__init__.py | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ipaacalib/java/src/ipaaca/Buffer.java b/ipaacalib/java/src/ipaaca/Buffer.java
index 95f61fb..993c2d2 100644
--- a/ipaacalib/java/src/ipaaca/Buffer.java
+++ b/ipaacalib/java/src/ipaaca/Buffer.java
@@ -46,9 +46,14 @@ public abstract class Buffer
private final String owningComponentName;
private List<IUEventHandler> eventHandlers = new ArrayList<IUEventHandler>();
- protected final String uuid = UUID.randomUUID().toString().replaceAll("-", "");
+ protected final String uuid = UUID.randomUUID().toString().replaceAll("-", "").substring(0, 8);
protected String uniqueName;
+ public String getUniqueShortName()
+ {
+ return owningComponentName + "ID" + uuid;
+ }
+
public String getUniqueName()
{
return uniqueName;
diff --git a/ipaacalib/java/src/ipaaca/InputBuffer.java b/ipaacalib/java/src/ipaaca/InputBuffer.java
index e5542c3..df7affe 100644
--- a/ipaacalib/java/src/ipaaca/InputBuffer.java
+++ b/ipaacalib/java/src/ipaaca/InputBuffer.java
@@ -123,7 +123,7 @@ public class InputBuffer extends Buffer
public InputBuffer(String owningComponentName, Set<String> categoryInterests)
{
super(owningComponentName);
- uniqueName = "/ipaaca/component/" + owningComponentName + "ID" + uuid + "/IB";
+ uniqueName = "/ipaaca/component/" + getUniqueShortName() + "/IB";
for (String cat : categoryInterests)
{
diff --git a/ipaacalib/java/src/ipaaca/OutputBuffer.java b/ipaacalib/java/src/ipaaca/OutputBuffer.java
index 999e2e5..35bdae6 100644
--- a/ipaacalib/java/src/ipaaca/OutputBuffer.java
+++ b/ipaacalib/java/src/ipaaca/OutputBuffer.java
@@ -93,7 +93,7 @@ public class OutputBuffer extends Buffer
{
super(owningComponentName);
- uniqueName = "/ipaaca/component/" + owningComponentName + "ID" + uuid + "/OB";
+ uniqueName = "/ipaaca/component/" + getUniqueShortName() + "/OB";
logger.debug("Creating server for {}", uniqueName);
server = Factory.getInstance().createLocalServer(uniqueName);
try
diff --git a/ipaacalib/python/src/ipaaca/__init__.py b/ipaacalib/python/src/ipaaca/__init__.py
index 538bffa..1aeff84 100755
--- a/ipaacalib/python/src/ipaaca/__init__.py
+++ b/ipaacalib/python/src/ipaaca/__init__.py
@@ -247,7 +247,7 @@ class Payload(dict):
self._collected_modifications = {}
self._collected_removals = []
self._update_on_every_change = True
- self.batch_update_lock.release()
+ self._batch_update_lock.release()
def _remotely_enforced_setitem(self, k, v):
"""Sets an item when requested remotely."""
--
GitLab