From 767482783e56b2395731d83f22b7a4549db674be Mon Sep 17 00:00:00 2001
From: Hendrik Buschmeier <hbuschme@uni-bielefeld.de>
Date: Thu, 18 Dec 2014 10:45:37 +0100
Subject: [PATCH] Fixed channel initialisation in InputBuffer, InputBuffer
unittest.
---
ipaacalib/java/src/ipaaca/InputBuffer.java | 3 ++-
ipaacalib/java/test/src/ipaaca/InputBufferTest.java | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ipaacalib/java/src/ipaaca/InputBuffer.java b/ipaacalib/java/src/ipaaca/InputBuffer.java
index 444d9ab..9c1ff22 100644
--- a/ipaacalib/java/src/ipaaca/InputBuffer.java
+++ b/ipaacalib/java/src/ipaaca/InputBuffer.java
@@ -139,11 +139,12 @@ public class InputBuffer extends Buffer
String shortIDName = getUniqueShortName();
uniqueName = "/ipaaca/component/" + shortIDName + "/IB";
+ this.channel = ipaaca_channel;
+
for (String cat : categoryInterests)
{
createCategoryListenerIfNeeded(cat);
}
- this.channel = ipaaca_channel;
// add own uuid as identifier for hidden channel. (dlw)
createCategoryListenerIfNeeded(shortIDName);
diff --git a/ipaacalib/java/test/src/ipaaca/InputBufferTest.java b/ipaacalib/java/test/src/ipaaca/InputBufferTest.java
index d0ff20a..420a368 100644
--- a/ipaacalib/java/test/src/ipaaca/InputBufferTest.java
+++ b/ipaacalib/java/test/src/ipaaca/InputBufferTest.java
@@ -22,7 +22,7 @@ import com.google.common.collect.ImmutableSet;
public class InputBufferTest
{
private static final String COMPID = "Comp1";
- private static final String CATEGORY = "category1";
+ private static final String CATEGORY = "testcat";
private InputBuffer inBuffer;
@@ -47,10 +47,10 @@ public class InputBufferTest
@Test
public void testHandleRemotePushEvent() throws RSBException, InterruptedException
{
- Informer<Object> informer = Factory.getInstance().createInformer("/ipaaca/category/"+CATEGORY);
+ Informer<Object> informer = Factory.getInstance().createInformer("/ipaaca/channel/default/category/"+CATEGORY);
informer.activate();
RemotePushIU iu = new RemotePushIU("uid1");
- iu.setCategory("/ipaaca/category/"+CATEGORY);
+ iu.setCategory("/ipaaca/channel/default/category/"+CATEGORY);
iu.setOwnerName("owner");
iu.setReadOnly(false);
iu.setRevision(1);
--
GitLab