[jboss-cvs] JBoss Messaging SVN: r2786 - in trunk: tests/src/org/jboss/test/messaging/jms/server and 1 other directory.

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

Author: sergeypk
Date: 2007-06-18 03:51:35 -0400 (Mon, 18 Jun 2007)
New Revision: 2786

Modified:
   trunk/src/main/org/jboss/jms/server/ServerPeer.java
   trunk/tests/src/org/jboss/test/messaging/jms/server/ServerPeerConfigurationTest.java
Log:
Disallow setting ServerPeerID to a negative value since there was a similar check in the constructor that was removed.

Modified: trunk/src/main/org/jboss/jms/server/ServerPeer.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/ServerPeer.java	2007-06-18 07:40:59 UTC (rev 2785)
+++ trunk/src/main/org/jboss/jms/server/ServerPeer.java	2007-06-18 07:51:35 UTC (rev 2786)
@@ -558,6 +558,10 @@
       {
          throw new IllegalStateException("Cannot set ServerPeerID while the service is running");
       }
+      if (serverPeerID < 0)
+      {
+         throw new IllegalArgumentException("Attempt to set negative ServerPeerID: " + serverPeerID);
+      }
       this.serverPeerID = serverPeerID;
       log.info("ServerPeerID set to " + serverPeerID);
    }

Modified: trunk/tests/src/org/jboss/test/messaging/jms/server/ServerPeerConfigurationTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/server/ServerPeerConfigurationTest.java	2007-06-18 07:40:59 UTC (rev 2785)
+++ trunk/tests/src/org/jboss/test/messaging/jms/server/ServerPeerConfigurationTest.java	2007-06-18 07:51:35 UTC (rev 2786)
@@ -69,6 +69,25 @@
       testStartupOnlyAttribute("DefaultTopicJNDIContext", "/mytopics", "/othertopics");
    }
    
+   public void testCannotSetNegativeServerPeerID() throws Exception
+   {
+      LocalTestServer server = new LocalTestServer();
+      ServiceAttributeOverrides overrides = new ServiceAttributeOverrides();
+      // Can't use server.getServerPeerObjectName() here since it's not known to the server yet.
+      overrides.put(ServiceContainer.SERVER_PEER_OBJECT_NAME, "ServerPeerID", "-10");
+      
+      try
+      {
+         server.start("all", overrides, false, true);
+         server.stop();
+         fail("Should have thrown an exception when setting ServerPeerID to a negative value");
+      }
+      catch (RuntimeMBeanException rmbe)
+      {
+         assertTrue(rmbe.getCause() instanceof IllegalArgumentException);
+      }
+   }
+   
    // Package protected ---------------------------------------------
 
    // Protected -----------------------------------------------------