forked from JacORB/JacORB
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
BZ947 Add fix for invalid disconnection logic
- Loading branch information
Showing
4 changed files
with
259 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
250 changes: 250 additions & 0 deletions
250
test/regression/src/org/jacorb/test/orb/DisconnectTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,250 @@ | ||
| package org.jacorb.test.orb; | ||
|
|
||
| /* | ||
| * JacORB - a free Java ORB | ||
| * | ||
| * Copyright (C) 1997-2013 Gerald Brose / The JacORB Team. | ||
| * | ||
| * This library is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Library General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 2 of the License, or (at your option) any later version. | ||
| * | ||
| * This library is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Library General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Library General Public | ||
| * License along with this library; if not, write to the Free | ||
| * Software Foundation, 51 Franklin Street, Fifth Floor, Boston, | ||
| * MA 02110-1301, USA. | ||
| */ | ||
|
|
||
| import java.lang.reflect.Field; | ||
| import java.util.HashMap; | ||
| import java.util.Properties; | ||
| import junit.framework.Test; | ||
| import junit.framework.TestSuite; | ||
| import org.jacorb.orb.Delegate; | ||
| import org.jacorb.orb.giop.ClientConnection; | ||
| import org.jacorb.orb.giop.ClientConnectionManager; | ||
| import org.jacorb.test.BasicServer; | ||
| import org.jacorb.test.BasicServerHelper; | ||
| import org.jacorb.test.common.ClientServerSetup; | ||
| import org.jacorb.test.common.ClientServerTestCase; | ||
| import org.jacorb.test.common.JacORBTestSuite; | ||
| import org.omg.CORBA.TIMEOUT; | ||
| import org.omg.ETF.Profile; | ||
|
|
||
| /** | ||
| * @author Nick Cross | ||
| * | ||
| * Verifies that the connection map is cleared after a timeout and disconnect. | ||
| */ | ||
| public class DisconnectTest extends ClientServerTestCase | ||
| { | ||
| protected BasicServer server = null; | ||
|
|
||
|
|
||
| public DisconnectTest(String name, ClientServerSetup setup) | ||
| { | ||
| super(name, setup); | ||
| } | ||
|
|
||
| protected void setUp() throws Exception | ||
| { | ||
| server = BasicServerHelper.narrow( setup.getServerObject() ); | ||
| } | ||
|
|
||
| protected void tearDown() throws Exception | ||
| { | ||
| server = null; | ||
| } | ||
|
|
||
| public static Test suite() | ||
| { | ||
| TestSuite suite = new JacORBTestSuite("Disconnect client test", DisconnectTest.class); | ||
|
|
||
| Properties client_props = new Properties(); | ||
| client_props.setProperty ("jacorb.retries", "0"); | ||
| client_props.setProperty ("jacorb.retry_interval", "50"); | ||
|
|
||
| client_props.setProperty | ||
| ("jacorb.connection.client.pending_reply_timeout", "5000"); | ||
|
|
||
| Properties server_props = new Properties(); | ||
| server_props.setProperty( "org.omg.PortableInterceptor.ORBInitializerClass." | ||
| + DisconnectInitializer.class.getName(), "" ); | ||
|
|
||
|
|
||
|
|
||
| ClientServerSetup setup = new ClientServerSetup( suite, | ||
| "org.jacorb.test.orb.BasicServerImpl", | ||
| client_props, | ||
| server_props); | ||
|
|
||
| suite.addTest( new DisconnectTest( "test_disconnect", setup )); | ||
|
|
||
| return setup; | ||
| } | ||
|
|
||
| public void test_disconnect() | ||
| { | ||
| boolean timeout = false; | ||
| try | ||
| { | ||
| server.ping(); | ||
| } | ||
| catch (TIMEOUT e) | ||
| { | ||
| timeout = true; | ||
|
|
||
| Field fconnmgr; | ||
| Field connections; | ||
| try | ||
| { | ||
| fconnmgr = Delegate.class.getDeclaredField("conn_mg"); | ||
| fconnmgr.setAccessible(true); | ||
| Delegate d = (Delegate) ((org.omg.CORBA.portable.ObjectImpl)server)._get_delegate(); | ||
| ClientConnectionManager ccm = (ClientConnectionManager) fconnmgr.get(d); | ||
| connections = ClientConnectionManager.class.getDeclaredField("connections"); | ||
| connections.setAccessible(true); | ||
| @SuppressWarnings("unchecked") | ||
| HashMap<Profile, ClientConnection> c = (HashMap<Profile, ClientConnection>) connections.get(ccm); | ||
|
|
||
| assertTrue (c.size() == 0); | ||
| } | ||
| catch (SecurityException e1) | ||
| { | ||
| // TODO Auto-generated catch block | ||
| e1.printStackTrace(); | ||
| } | ||
| catch (NoSuchFieldException e1) | ||
| { | ||
| // TODO Auto-generated catch block | ||
| e1.printStackTrace(); | ||
| } | ||
| catch (IllegalArgumentException e1) | ||
| { | ||
| // TODO Auto-generated catch block | ||
| e1.printStackTrace(); | ||
| } | ||
| catch (IllegalAccessException e1) | ||
| { | ||
| // TODO Auto-generated catch block | ||
| e1.printStackTrace(); | ||
| } | ||
| } | ||
| if ( ! timeout ) | ||
| { | ||
| fail ("Did not catch a timeout"); | ||
| } | ||
| } | ||
|
|
||
| public static class DisconnectInitializer | ||
| extends org.omg.CORBA.LocalObject | ||
| implements org.omg.PortableInterceptor.ORBInitializer | ||
| { | ||
| /** | ||
| * Called before init of the actual ORB. | ||
| * | ||
| * @param info The ORB init info. | ||
| */ | ||
| public void pre_init (org.omg.PortableInterceptor.ORBInitInfo info) | ||
| { | ||
| try | ||
| { | ||
| info.add_server_request_interceptor (new ServerInterceptorA()); | ||
| } | ||
| catch ( org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName ex ) | ||
| { | ||
| fail ("unexpected exception received: " + ex); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Called after init of the actual ORB. | ||
| * | ||
| * @param info The ORB init info. | ||
| */ | ||
| public void post_init (org.omg.PortableInterceptor.ORBInitInfo info) | ||
| { | ||
| } | ||
| } | ||
|
|
||
| static class ServerInterceptorA | ||
| extends org.omg.CORBA.LocalObject | ||
| implements org.omg.PortableInterceptor.ServerRequestInterceptor | ||
| { | ||
| static boolean localDebugOn = false; | ||
|
|
||
| public java.lang.String name() | ||
| { | ||
| return ""; | ||
| } | ||
|
|
||
| public void destroy() | ||
| { | ||
| } | ||
|
|
||
| public void receive_request_service_contexts( | ||
| org.omg.PortableInterceptor.ServerRequestInfo ri ) | ||
| throws org.omg.PortableInterceptor.ForwardRequest | ||
| { | ||
| if (localDebugOn) | ||
| { | ||
| System.out.println ("LocalServerInterceptorA - receive_request_service_contexts"); | ||
| } | ||
| } | ||
|
|
||
| public void receive_request( org.omg.PortableInterceptor.ServerRequestInfo ri ) | ||
| throws org.omg.PortableInterceptor.ForwardRequest | ||
| { | ||
| if (localDebugOn) | ||
| { | ||
| System.out.println ("LocalServerInterceptorA - receive_request"); | ||
| } | ||
| try | ||
| { | ||
| Thread.sleep (10000); | ||
| } | ||
| catch (InterruptedException e) | ||
| { | ||
| // TODO Auto-generated catch block | ||
| e.printStackTrace(); | ||
| } | ||
| } | ||
|
|
||
| public void send_reply( org.omg.PortableInterceptor.ServerRequestInfo ri ) | ||
| { | ||
| if (localDebugOn) | ||
| { | ||
| System.out.println ("LocalServerInterceptorA - send_reply"); | ||
| } | ||
| } | ||
|
|
||
| public void send_exception( org.omg.PortableInterceptor.ServerRequestInfo ri ) | ||
| throws org.omg.PortableInterceptor.ForwardRequest | ||
| { | ||
| if (localDebugOn) | ||
| { | ||
| System.out.println ("LocalServerInterceptorA - send_exception"); | ||
| } | ||
| } | ||
|
|
||
| public void send_other( org.omg.PortableInterceptor.ServerRequestInfo ri ) | ||
| throws org.omg.PortableInterceptor.ForwardRequest | ||
| { | ||
| if (localDebugOn) | ||
| { | ||
| System.out.println ("LocalServerInterceptorA - send_other"); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public static void main(String args[]) | ||
| { | ||
| junit.textui.TestRunner.run(suite()); | ||
| } | ||
| } |