mx4j/src/test/test/javax/management/remote JMXConnectorTestCase.java,1.16,1.17 JMXConnectorFactoryTest.java,1.6,1.7

Update of /cvsroot/mx4j/mx4j/src/test/test/javax/management/remote
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8080/test/test/javax/management/remote

Modified Files:
	JMXConnectorTestCase.java JMXConnectorFactoryTest.java 
Log Message:
Fixing the tests by restoring the context classloader after having changed it

Index: JMXConnectorTestCase.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/test/test/javax/management/remote/JMXConnectorTestCase.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** JMXConnectorTestCase.java	1 Mar 2004 18:22:55 -0000	1.16
--- JMXConnectorTestCase.java	2 Mar 2004 09:09:46 -0000	1.17
***************
*** 354,364 ****
           Map serverEnv = getEnvironment();
           serverEnv.put(JMXConnectorServerFactory.PROTOCOL_PROVIDER_CLASS_LOADER, getClass().getClassLoader());
           Thread.currentThread().setContextClassLoader(getClass().getClassLoader().getParent());
           cntorServer = JMXConnectorServerFactory.newJMXConnectorServer(url, serverEnv, server);
           cntorServer.start();
  
           cntor = JMXConnectorFactory.connect(cntorServer.getAddress(), getEnvironment());
           MBeanServerConnection mbsc = cntor.getMBeanServerConnection();
! 
        }
        finally
--- 354,366 ----
           Map serverEnv = getEnvironment();
           serverEnv.put(JMXConnectorServerFactory.PROTOCOL_PROVIDER_CLASS_LOADER, getClass().getClassLoader());
+          ClassLoader old = Thread.currentThread().getContextClassLoader();
           Thread.currentThread().setContextClassLoader(getClass().getClassLoader().getParent());
           cntorServer = JMXConnectorServerFactory.newJMXConnectorServer(url, serverEnv, server);
           cntorServer.start();
+          Thread.currentThread().setContextClassLoader(old);
  
           cntor = JMXConnectorFactory.connect(cntorServer.getAddress(), getEnvironment());
           MBeanServerConnection mbsc = cntor.getMBeanServerConnection();
!          assertNotNull(mbsc);
        }
        finally

Index: JMXConnectorFactoryTest.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/test/test/javax/management/remote/JMXConnectorFactoryTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** JMXConnectorFactoryTest.java	1 Mar 2004 18:21:33 -0000	1.6
--- JMXConnectorFactoryTest.java	2 Mar 2004 09:09:46 -0000	1.7
***************
*** 114,121 ****
        HashMap env = new HashMap();
        JMXServiceURL url = new JMXServiceURL("service:jmx:rmi://host");
!       Thread.currentThread().setContextClassLoader(getClass().getClassLoader().getParent());
!       env.put(JMXConnectorFactory.PROTOCOL_PROVIDER_CLASS_LOADER, getClass().getClassLoader());
!       JMXConnector connector = JMXConnectorFactory.newJMXConnector(url, env);
!       assertNotNull(connector);
     }
  
--- 114,129 ----
        HashMap env = new HashMap();
        JMXServiceURL url = new JMXServiceURL("service:jmx:rmi://host");
!       ClassLoader old = Thread.currentThread().getContextClassLoader();
!       try
!       {
!          Thread.currentThread().setContextClassLoader(getClass().getClassLoader().getParent());
!          env.put(JMXConnectorFactory.PROTOCOL_PROVIDER_CLASS_LOADER, getClass().getClassLoader());
!          JMXConnector connector = JMXConnectorFactory.newJMXConnector(url, env);
!          assertNotNull(connector);
!       }
!       finally
!       {
!          Thread.currentThread().setContextClassLoader(old);
!       }
     }
  



-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click