[openejb-scm] openejb/modules/core/src/java/org/openejb/corba/sunorb SunORBConfigAdapter.java

[djencks]

djencks     2005/06/22 04:19:24

  Modified:    modules/core/src/java/org/openejb/corba/sunorb
                        SunORBConfigAdapter.java
  Log:

  Improve the unprotected transport case
  
  Revision  Changes    Path
  1.7       +13 -3     
openejb/modules/core/src/java/org/openejb/corba/sunorb/SunORBConfigAdapter.java
  
  Index: SunORBConfigAdapter.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/sunorb/SunORBConfigAdapter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SunORBConfigAdapter.java  14 Apr 2005 16:09:56 -0000      1.6
  +++ SunORBConfigAdapter.java  22 Jun 2005 08:19:24 -0000      1.7
  @@ -68,6 +68,7 @@
   import org.openejb.corba.security.config.tss.TSSConfig;
   import org.openejb.corba.security.config.tss.TSSSSLTransportConfig;
   import org.openejb.corba.security.config.tss.TSSTransportMechConfig;
  +import com.sun.corba.se.internal.core.EndPoint;
   
   
   /**
  @@ -171,12 +172,13 @@
        * @throws ConfigException thrown if any error occurs
        */
       public void postProcess(TSSConfig config, ORB orb) throws 
ConfigException {
  +        OpenEJBORB o = (OpenEJBORB) orb;
           if (config != null) {
               TSSTransportMechConfig transportMech = 
config.getTransport_mech();
               if (transportMech != null) {
                   if (transportMech instanceof TSSSSLTransportConfig) {
                       TSSSSLTransportConfig sslConfig = 
(TSSSSLTransportConfig) transportMech;
  -                    OpenEJBORB o = (OpenEJBORB) orb;
  +
   
                       try {
                           
o.getServerGIOP().getEndpoint(OpenEJBSocketFactory.IIOP_SSL, 
sslConfig.getPort(), null);
  @@ -186,7 +188,15 @@
                       }
                   }
               }
  +        } else {
  +            try {
  +                o.getServerGIOP().getEndpoint(EndPoint.IIOP_CLEAR_TEXT, 
6882, null);
  +            } catch (Throwable e) {
  +                log.error(e);
  +                throw new ConfigException(e);
  +            }
           }
  +
       }
   
       public String[] translateToArgs(CSSConfig config, List args) throws 
ConfigException {