Merge portb:/homes/hbuschme/repo/ipaaca

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);

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);