[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/multiplexer ...

[Brian Stansberry]

  User: bstansberry
  Date: 06/11/03 14:17:16

  Modified:    tests/functional/org/jboss/cache/multiplexer  Tag:
                        Branch_JBossCache_1_4_0 MultiplexerTestHelper.java
  Log:
  Use default server name
  Avoid NPE if cache is using default props
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +4 -2      JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/MultiplexerTestHelper.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MultiplexerTestHelper.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/MultiplexerTestHelper.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -b -r1.1.2.1 -r1.1.2.2
  --- MultiplexerTestHelper.java	3 Nov 2006 18:55:21 -0000	1.1.2.1
  +++ MultiplexerTestHelper.java	3 Nov 2006 19:17:16 -0000	1.1.2.2
  @@ -48,7 +48,7 @@
      public MultiplexerTestHelper() 
      {
         mbeanServer = 
  -         MBeanServerFactory.createMBeanServer("jboss");
  +         MBeanServerFactory.createMBeanServer();
      }
      
      public void configureCacheForMux(TreeCacheMBean cache) throws Exception
  @@ -69,7 +69,9 @@
      
      public MBeanServer getMBeanServerWithMux(TreeCacheMBean cache) throws Exception
      {
  -      return getMBeanServerWithMux(getClusterConfigElement(cache.getClusterProperties()));
  +      String props = cache.getClusterProperties();
  +      props = props == null ? JChannel.DEFAULT_PROTOCOL_STACK : props;
  +      return getMBeanServerWithMux(getClusterConfigElement(props));
      }
      
      public MBeanServer getMBeanServerWithMux(Element muxConfig) throws Exception