[jboss-cvs] JBoss Messaging SVN: r2942 - trunk/tests/src/org/jboss/test/messaging/tools/container.

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

Author: timfox
Date: 2007-07-31 17:11:27 -0400 (Tue, 31 Jul 2007)
New Revision: 2942

Modified:
   trunk/tests/src/org/jboss/test/messaging/tools/container/InVMInitialContextFactory.java
   trunk/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
   trunk/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java
Log:
Fixed evil bug in test framework


Modified: trunk/tests/src/org/jboss/test/messaging/tools/container/InVMInitialContextFactory.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/container/InVMInitialContextFactory.java	2007-07-31 17:52:55 UTC (rev 2941)
+++ trunk/tests/src/org/jboss/test/messaging/tools/container/InVMInitialContextFactory.java	2007-07-31 21:11:27 UTC (rev 2942)
@@ -76,7 +76,8 @@
 
    // Public --------------------------------------------------------
 
-   public Context getInitialContext(Hashtable environment) throws NamingException
+   //NOTE!! This method MUST be synchronized
+   public synchronized Context getInitialContext(Hashtable environment) throws NamingException
    {
       // try first in the environment passed as argument ...
       String s = (String)environment.get(Constants.SERVER_INDEX_PROPERTY_NAME);
@@ -104,7 +105,7 @@
                                    Constants.SERVER_INDEX_PROPERTY_NAME +"\". " +
                                    s + " is not an integer");
       }
-
+  
       int size = initialContexts.size();
 
       // pad the list to the right size

Modified: trunk/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java	2007-07-31 17:52:55 UTC (rev 2941)
+++ trunk/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java	2007-07-31 21:11:27 UTC (rev 2942)
@@ -189,7 +189,7 @@
       
       Thread.sleep(250);
       
-      System.exit(0);
+      Runtime.getRuntime().halt(1);
    }
 
    public void ping() throws Exception

Modified: trunk/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java	2007-07-31 17:52:55 UTC (rev 2941)
+++ trunk/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java	2007-07-31 21:11:27 UTC (rev 2942)
@@ -1422,8 +1422,10 @@
    {
       MockJBossSecurityManager sm = new MockJBossSecurityManager();
       this.initialContext.bind(MockJBossSecurityManager.TEST_SECURITY_DOMAIN, sm);
+      
+      toUnbindAtExit.add(MockJBossSecurityManager.TEST_SECURITY_DOMAIN);
 
-      log.debug("started JBoss Mock Security Manager");
+      log.debug("started JBoss Mock Security Manager, using ic: " + this.initialContext + " id " + System.identityHashCode(this.initialContext));
    }
 
    private void stopService(ObjectName target) throws Exception