BZ943 Fix rootpoa creation with bad socket

doc/REL_NOTES

@@ -52,6 +52,7 @@ This Release
          - Add public API for Client/ServerRequestInfo.
          - Add fix for NIO with large requests (BZ939).
          - Add fix for disconnect logic on bad connection (BZ947).
+         - Add fix for rootpoa creation with bad socket (BZ943).
 
     - TAO ImR/NS Compatibility
         - Implement the new property "jacorb.use_tao_imr".

src/org/jacorb/orb/ORB.java

@@ -1217,29 +1217,31 @@ public org.omg.CORBA.Object getReference( org.jacorb.poa.POA poa,
         return d.getReference( poa );
     }
 
-    public synchronized org.jacorb.poa.POA getRootPOA()
-    throws org.omg.CORBA.INITIALIZE
+    public synchronized org.jacorb.poa.POA getRootPOA() throws org.omg.CORBA.INITIALIZE
     {
         if ( rootpoa == null )
         {
-            rootpoa = org.jacorb.poa.POA._POA_init(this);
+            org.jacorb.poa.POA tmppoa = org.jacorb.poa.POA._POA_init(this);
+            tmppoa = org.jacorb.poa.POA._POA_init(this);
 
             basicAdapter = new BasicAdapter( this,
-                                             rootpoa,
+                                             tmppoa,
                                              getTransportManager(),
                                              giop_connection_manager
                                            );
 
             try
             {
-                rootpoa.configure(configuration);
+                tmppoa.configure(configuration);
                 basicAdapter.configure(configuration);
             }
             catch ( ConfigurationException ce )
             {
                 throw new org.omg.CORBA.INITIALIZE("ConfigurationException: " +
                                                    ce.toString() );
             }
+
+            rootpoa = tmppoa;
             rootpoa._addPOAEventListener( this );
 
         }

test/regression/src/org/jacorb/test/bugs/bug943/Bug943Test.java

@@ -0,0 +1,72 @@
+/*
+ *        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, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.jacorb.test.bugs.bug943;
+
+import java.util.Properties;
+import org.jacorb.test.common.CommonSetup;
+import org.jacorb.test.common.ORBTestCase;
+import org.omg.CORBA.INITIALIZE;
+import org.omg.CORBA.ORB;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.POAHelper;
+
+/**
+ * @author Nick Cross
+ */
+public class Bug943Test extends ORBTestCase
+{
+    public void test_poa_ssl_port() throws Exception
+    {
+        Properties props = new Properties();
+        props.putAll(CommonSetup.loadSSLProps("jsse_server_props", "jsse_server_ks"));
+        props.setProperty ("OASSLPort", "7777");
+
+        org.omg.CORBA.ORB orb = ORB.init(new String[0], props);
+        POA poa = POAHelper.narrow(orb.resolve_initial_references("RootPOA"));
+
+        org.omg.CORBA.ORB orb2 = ORB.init(new String[0], props);
+        try
+        {
+            POAHelper.narrow(orb2.resolve_initial_references("RootPOA"));
+        }
+        catch (INITIALIZE e)
+        {
+        }
+
+        try
+        {
+            POAHelper.narrow(orb2.resolve_initial_references("RootPOA"));
+            fail ("Should have raised an exception");
+        }
+        catch (INITIALIZE e)
+        {
+        }
+
+        poa.destroy(true, true);
+
+        orb2.shutdown(true);
+        orb2 = null;
+
+        orb.shutdown(true);
+        orb = null;
+    }
+
+}