[jboss-cvs] JBoss Messaging SVN: r6239 - in branches/Branch_1_4: src/main/org/jboss/messaging/core/jmx and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: gaohoward
Date: 2009-03-31 10:12:47 -0400 (Tue, 31 Mar 2009)
New Revision: 6239

Modified:
   branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java
   branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
   branches/Branch_1_4/src/main/org/jboss/messaging/core/jmx/MessagingPostOfficeService.java
   branches/Branch_1_4/tests/src/org/jboss/test/messaging/core/postoffice/PostOfficeManagementTest.java
Log:
https://jira.jboss.org/jira/browse/JBMESSAGING-1562


Modified: branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java	2009-03-31 14:03:53 UTC (rev 6238)
+++ branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java	2009-03-31 14:12:47 UTC (rev 6239)
@@ -110,6 +110,12 @@
    	
    	this.groupListener = groupListener;
    }
+   
+   //for test only
+   public String getGroupName()
+   {
+      return groupName;
+   }
      
    public void start() throws Exception
    {		

Modified: branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2009-03-31 14:03:53 UTC (rev 6238)
+++ branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2009-03-31 14:12:47 UTC (rev 6239)
@@ -338,6 +338,12 @@
       
       log.debug("Using JGroups flow control workaround: " + this.useJGroupsWorkaround);
    }
+   
+   //for test only
+   public GroupMember getGroupMember()
+   {
+      return groupMember;
+   }
       
    // MessagingComponent overrides -----------------------------------------------------------------
    

Modified: branches/Branch_1_4/src/main/org/jboss/messaging/core/jmx/MessagingPostOfficeService.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/messaging/core/jmx/MessagingPostOfficeService.java	2009-03-31 14:03:53 UTC (rev 6238)
+++ branches/Branch_1_4/src/main/org/jboss/messaging/core/jmx/MessagingPostOfficeService.java	2009-03-31 14:12:47 UTC (rev 6239)
@@ -434,7 +434,7 @@
          	// http://jira.jboss.org/jira/browse/JBMESSAGING-1244
          	// if the channelPartitionName is set, we use it to identify the control and
          	// data channels. Otherwise, we fall back to use groupName
-         	String channelName = (channelPartitionName == null)? channelPartitionName : groupName;
+         	String channelName = (channelPartitionName != null)? channelPartitionName : groupName;
          	
 	         postOffice =  new MessagingPostOffice(ds, tm, sqlProperties,
 	                                               createTablesOnStartup,

Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/core/postoffice/PostOfficeManagementTest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/core/postoffice/PostOfficeManagementTest.java	2009-03-31 14:03:53 UTC (rev 6238)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/core/postoffice/PostOfficeManagementTest.java	2009-03-31 14:12:47 UTC (rev 6239)
@@ -24,11 +24,9 @@
 package org.jboss.test.messaging.core.postoffice;
 
 import javax.management.ObjectName;
-import javax.naming.InitialContext;
 
+import org.jboss.messaging.core.impl.postoffice.MessagingPostOffice;
 import org.jboss.test.messaging.MessagingTestCase;
-import org.jboss.test.messaging.core.PostOfficeTestBase;
-import org.jboss.test.messaging.jms.JMSTestCase;
 import org.jboss.test.messaging.tools.ServerManagement;
 
 /**
@@ -85,6 +83,25 @@
       assertTrue(failoverOnNodeLeave);
    }
 
+
+   //https://jira.jboss.org/jira/browse/JBMESSAGING-1562
+   public void testGroupNameOverride() throws Exception
+   {
+      ServerManagement.stop();
+      System.setProperty("test.clustered", "true");
+      ServerManagement.start(0, "all");
+      
+      ObjectName poName = ServerManagement.getServer(0).getPostOfficeObjectName();
+      MessagingPostOffice office = (MessagingPostOffice)ServerManagement.getAttribute(poName, "Instance");
+      
+      String groupName = office.getGroupMember().getGroupName();
+      
+      assertEquals("MessagingPostOffice", groupName);
+
+      ServerManagement.stop(0);
+      System.setProperty("test.clustered", "false");
+   }
+
    // Package protected ---------------------------------------------
 
    // Protected -----------------------------------------------------