geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r641268 - in /geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb: OB/ OBCORBA/ OBPortableServer/ OCI/ OCI/IIOP/
Date Wed, 26 Mar 2008 11:50:20 GMT
Author: rickmcguire
Date: Wed Mar 26 04:50:17 2008
New Revision: 641268

URL: http://svn.apache.org/viewvc?rev=641268&view=rev
Log:
YOKO-424 Yoko default concurrency model different from other orb implementations.


Modified:
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchStrategyFactory_impl.java
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Downcall.java
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPConnectionThreaded.java
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBCORBA/ORB_impl.java
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBPortableServer/ServantLocatorStrategy.java
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Acceptor_impl.java
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Transport_impl.java
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/iiop.java

Modified: geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchStrategyFactory_impl.java
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchStrategyFactory_impl.java?rev=641268&r1=641267&r2=641268&view=diff
==============================================================================
--- geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchStrategyFactory_impl.java
(original)
+++ geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchStrategyFactory_impl.java
Wed Mar 26 04:50:17 2008
@@ -16,6 +16,9 @@
  */
 
 package org.apache.yoko.orb.OB;
+ 
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import org.apache.yoko.orb.OB.DispatchRequest;
 import org.apache.yoko.orb.OB.DispatchStrategy;
@@ -142,6 +145,7 @@
 
 public class DispatchStrategyFactory_impl extends org.omg.CORBA.LocalObject
         implements DispatchStrategyFactory {
+    static final Logger logger = Logger.getLogger(DispatchStrategyFactory.class.getName());
     //
     // A sequence of thread pools. The index in the sequence is the
     // thread pool id.
@@ -177,25 +181,29 @@
         // The ORB destroys this object, so it's an initialization
         // error if this operation is called after ORB destruction
         //
-        if (destroy_)
+        if (destroy_) {
             throw new org.omg.CORBA.INITIALIZE(org.apache.yoko.orb.OB.MinorCodes
                     .describeInitialize(org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed),
                     org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed,
                     org.omg.CORBA.CompletionStatus.COMPLETED_NO);
+        }
 
         //
         // Find the first empty thread pool
         //
         int i;
-        for (i = 0; i < pools_.size(); i++)
-            if (pools_.elementAt(i) == null)
+        for (i = 0; i < pools_.size(); i++) {
+            if (pools_.elementAt(i) == null) {
                 break;
+            }
+        }
 
         //
         // If there is no empty slot then append an empty slot
         //
-        if (i >= pools_.size())
+        if (i >= pools_.size()) {
             pools_.addElement(null);
+        }
 
         //
         // Allocate a new ThreadPool
@@ -211,14 +219,16 @@
         // The ORB destroys this object, so it's an initialization error
         // if this operation is called after ORB destruction
         //
-        if (destroy_)
+        if (destroy_) {
             throw new org.omg.CORBA.INITIALIZE(org.apache.yoko.orb.OB.MinorCodes
                     .describeInitialize(org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed),
                     org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed,
                     org.omg.CORBA.CompletionStatus.COMPLETED_NO);
+        }
 
-        if (id < 0 || id > pools_.size() || pools_.elementAt(id) == null)
+        if (id < 0 || id > pools_.size() || pools_.elementAt(id) == null) {
             throw new InvalidThreadPool();
+        }
 
         //
         // Destroy the ThreadPool
@@ -237,14 +247,16 @@
         // The ORB destroys this object, so it's an initialization error
         // if this operation is called after ORB destruction
         //
-        if (destroy_)
+        if (destroy_) {
             throw new org.omg.CORBA.INITIALIZE(org.apache.yoko.orb.OB.MinorCodes
                     .describeInitialize(org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed),
                     org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed,
                     org.omg.CORBA.CompletionStatus.COMPLETED_NO);
+        }
 
-        if (id < 0 || id > pools_.size() || pools_.elementAt(id) == null)
+        if (id < 0 || id > pools_.size() || pools_.elementAt(id) == null) {
             throw new InvalidThreadPool();
+        }
 
         return new DispatchThreadPool_impl(id, (ThreadPool) pools_
                 .elementAt(id));
@@ -255,12 +267,12 @@
         // The ORB destroys this object, so it's an initialization error
         // if this operation is called after ORB destruction
         //
-        if (destroy_)
+        if (destroy_) {
             throw new org.omg.CORBA.INITIALIZE(org.apache.yoko.orb.OB.MinorCodes
                     .describeInitialize(org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed),
                     org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed,
                     org.omg.CORBA.CompletionStatus.COMPLETED_NO);
-
+        }
         return new DispatchSameThread_impl();
     }
 
@@ -269,12 +281,12 @@
         // The ORB destroys this object, so it's an initialization error
         // if this operation is called after ORB destruction
         //
-        if (destroy_)
+        if (destroy_) {
             throw new org.omg.CORBA.INITIALIZE(org.apache.yoko.orb.OB.MinorCodes
                     .describeInitialize(org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed),
                     org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed,
                     org.omg.CORBA.CompletionStatus.COMPLETED_NO);
-
+        }
         return new DispatchThreadPerRequest_impl();
     }
 
@@ -283,11 +295,12 @@
         // The ORB destroys this object, so it's an initialization error
         // if this operation is called after ORB destruction
         //
-        if (destroy_)
+        if (destroy_) {
             throw new org.omg.CORBA.INITIALIZE(org.apache.yoko.orb.OB.MinorCodes
                     .describeInitialize(org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed),
                     org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed,
                     org.omg.CORBA.CompletionStatus.COMPLETED_NO);
+        }
 
         //
         // Get the ORB properties
@@ -301,9 +314,12 @@
         String value = properties.getProperty("yoko.orb.oa.conc_model");
 
         if (value != null) {
+            logger.fine("Defined concurrency model is " + value); 
             if (value.equals("threaded") || value.equals("thread_per_client")) {
+                logger.fine("Using same thread dispatch strategy"); 
                 return create_same_thread_strategy();
             } else if (value.equals("thread_per_request")) {
+                logger.fine("Using thread per request dispatch strategy"); 
                 return create_thread_per_request_strategy();
             } else if (value.equals("thread_pool")) {
                 //
@@ -314,13 +330,17 @@
                     haveDefaultThreadPool_ = true;
                     value = properties.getProperty("yoko.orb.oa.thread_pool");
                     int nthreads = 0;
-                    if (value != null)
+                    if (value != null) {
                         nthreads = Integer.parseInt(value);
-                    if (nthreads == 0)
+                    }
+                    if (nthreads == 0) {
                         nthreads = 10;
+                    }
+                    logger.fine("Creating a thread pool of size " + nthreads); 
                     defaultThreadPool_ = create_thread_pool(nthreads);
                 }
                 try {
+                    logger.fine("Using a thread pool dispatch strategy"); 
                     return create_thread_pool_strategy(defaultThreadPool_);
                 } catch (InvalidThreadPool ex) {
                     Assert._OB_assert(ex);
@@ -334,9 +354,11 @@
         }
 
         //
-        // The default
+        // The default is to use a thread-per-request.  Not doing this can cause 
+        // deadlocks, so the single thread 
         //
-        return create_same_thread_strategy();
+        logger.fine("Using default thread per request strategy"); 
+        return create_thread_per_request_strategy();
     }
 
     // ------------------------------------------------------------------

Modified: geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Downcall.java
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Downcall.java?rev=641268&r1=641267&r2=641268&view=diff
==============================================================================
--- geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Downcall.java (original)
+++ geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Downcall.java Wed Mar 26
04:50:17 2008
@@ -629,8 +629,9 @@
         //
         // Yield if non-blocking or blocking with zero timeout
         //
-        if (!block || (block && t == 0))
+        if (!block || (block && t == 0)) {
             Thread.yield();
+        }
 
         //
         // Wait for the desired state, taking the timeout and blocking
@@ -640,8 +641,9 @@
         synchronized (stateMonitor_) {
             while (state_ == DowncallStateUnsent
                     || state_ == DowncallStatePending) {
-                if (!block)
+                if (!block) {
                     return false;
+                }
 
                 try {
                     if (t < 0) {
@@ -651,11 +653,12 @@
 
                         stateMonitor_.wait(t);
 
-                        if (state_ == oldState)
+                        if (state_ == oldState) {
                             throw new org.omg.CORBA.NO_RESPONSE(
                                     "Timeout during receive",
                                     0,
                                     org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
+                        }
                     }
                 } catch (InterruptedException ex) {
                 }

Modified: geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPConnectionThreaded.java
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPConnectionThreaded.java?rev=641268&r1=641267&r2=641268&view=diff
==============================================================================
--- geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPConnectionThreaded.java
(original)
+++ geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPConnectionThreaded.java
Wed Mar 26 04:50:17 2008
@@ -119,10 +119,12 @@
         // Retrieve the thread group
         //
         ThreadGroup group;
-        if ((properties_ & Property.CreatedByClient) != 0)
+        if ((properties_ & Property.CreatedByClient) != 0) {
             group = orbInstance_.getClientWorkerGroup();
-        else
+        }
+        else {
             group = orbInstance_.getServerWorkerGroup();
+        }
 
         //
         // Start receiver thread
@@ -147,8 +149,9 @@
         while (i.hasNext()) {
             Thread thr = (Thread) i.next();
 
-            if (!thr.isAlive())
+            if (!thr.isAlive()) {
                 i.remove();
+            }
         }
     }
 
@@ -366,10 +369,12 @@
                     Thread t = (Thread) i.next();
 
                     try {
-                        if (timeout > 0)
+                        if (timeout > 0) {
                             t.join(timeout);
-                        else
+                        }
+                        else {
                             t.join();
+                        }
                     } catch (InterruptedException ex) {
                         continue;
                     }
@@ -495,8 +500,7 @@
                 // the upcall doesn't return back into a receiving state
                 // until the function processing is done)
                 //
-                boolean haveBidirSCL = transport_.get_info()
-                        .received_bidir_SCL();
+                boolean haveBidirSCL = transport_.get_info().received_bidir_SCL();
 
                 //
                 // if we have received a bidirectional SCL then we need
@@ -516,8 +520,9 @@
                 // then we can quit this thread because we know another
                 // will be ready to take over anyway
                 // 
-                if (haveBidirSCL)
+                if (haveBidirSCL) {
                     break;
+                }
             }
         }
     }
@@ -558,7 +563,7 @@
         Assert._OB_assert(transport_.mode() != org.apache.yoko.orb.OCI.SendReceiveMode.ReceiveOnly);
         Assert._OB_assert(down.unsent() == true);
         
-        logger.fine("Sending a request with Downcall of type " + down.getClass().getName());

+        logger.fine("Sending a request with Downcall of type " + down.getClass().getName()
+ " for operation " + down.operation() + " on transport " + transport_); 
 
         //
         // if we send off a message in the loop, this var might help us
@@ -572,6 +577,7 @@
         //
         synchronized (this) {
             if ((enabledOps_ & AccessOp.Write) == 0) {
+                logger.fine("writing not enabled for this connection"); 
                 down.setFailureException(new org.omg.CORBA.TRANSIENT());
                 return true;
             }
@@ -617,8 +623,9 @@
                 Downcall nextDown;
 
                 synchronized (this) {
-                    if (!down.unsent())
+                    if (!down.unsent()) {
                         break;
+                    }
 
                     Assert._OB_assert(messageQueue_.hasUnsent());
 
@@ -727,7 +734,7 @@
     // client-side receive method (from DowncallEmitter)
     //
     public boolean receive(Downcall down, boolean block) {
-        logger.fine("Receiving response with Downcall of type " + down.getClass().getName());

+        logger.fine("Receiving response with Downcall of type " + down.getClass().getName()
+ " for operation " + down.operation() + " from transport " + transport_); 
         //
         // Try to receive the reply
         //
@@ -748,8 +755,9 @@
         ACM_disableIdleMonitor();
 
         try {
-            if (send(down, true))
+            if (send(down, true)) {
                 return true;
+            }
             return receive(down, true);
         } finally {
             ACM_enableIdleMonitor();
@@ -776,8 +784,9 @@
         if (transport_.mode() != org.apache.yoko.orb.OCI.SendReceiveMode.SendOnly) {
             try {
                 synchronized (this) {
-                    if (receiverThreads_.size() > 0)
+                    if (receiverThreads_.size() > 0) {
                         return;
+                    }
 
                     addReceiverThread();
                 }

Modified: geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBCORBA/ORB_impl.java
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBCORBA/ORB_impl.java?rev=641268&r1=641267&r2=641268&view=diff
==============================================================================
--- geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBCORBA/ORB_impl.java (original)
+++ geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBCORBA/ORB_impl.java Wed Mar
26 04:50:17 2008
@@ -928,11 +928,13 @@
             org.apache.yoko.orb.OB.Assert._OB_assert(value != null);
 
             if (key.equals("yoko.orb.conc_model")) {
-                if (value.equals("threaded"))
+                if (value.equals("threaded")) {
                     concModel = org.apache.yoko.orb.OB.Client.Threaded;
-                else
+                }
+                else {
                     logger.warning("ORB.init: unknown value for "
                             + "yoko.orb.conc_model: " + value);
+                }
             } else if (key.startsWith("yoko.orb.trace.")) {
                 // Ignore -- handled in CoreTraceLevels
             } else if (key.startsWith("yoko.orb.policy.")) {
@@ -1661,7 +1663,7 @@
         }
 
         if (properties.getProperty("yoko.orb.oa.conc_model") == null) {
-            properties.put("yoko.orb.oa.conc_model", "thread_per_client");
+            properties.put("yoko.orb.oa.conc_model", "thread_pool");
         }
 
         //

Modified: geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBPortableServer/ServantLocatorStrategy.java
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBPortableServer/ServantLocatorStrategy.java?rev=641268&r1=641267&r2=641268&view=diff
==============================================================================
--- geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBPortableServer/ServantLocatorStrategy.java
(original)
+++ geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBPortableServer/ServantLocatorStrategy.java
Wed Mar 26 04:50:17 2008
@@ -46,13 +46,13 @@
         // been set will result in the BAD_INV_ORDER exception being
         // raised.
         //
-        if (servantLocator_ != null)
+        if (servantLocator_ != null) {
             throw new org.omg.CORBA.BAD_INV_ORDER(
                     org.apache.yoko.orb.OB.MinorCodes
                             .describeBadInvOrder(org.apache.yoko.orb.OB.MinorCodes.MinorServantManagerAlreadySet),
                     org.apache.yoko.orb.OB.MinorCodes.MinorServantManagerAlreadySet,
                     org.omg.CORBA.CompletionStatus.COMPLETED_NO);
-
+        }
         try {
             servantLocator_ = org.omg.PortableServer.ServantLocatorHelper
                     .narrow(manager);
@@ -113,12 +113,13 @@
         // the OBJ_ADAPTER system exception as the result of the
         // request.
         //
-        if (servant == null)
+        if (servant == null) {
             throw new org.omg.CORBA.OBJ_ADAPTER(
                     org.apache.yoko.orb.OB.MinorCodes
                             .describeObjAdapter(org.apache.yoko.orb.OB.MinorCodes.MinorServantNotFound),
                     org.apache.yoko.orb.OB.MinorCodes.MinorServantNotFound,
                     org.omg.CORBA.CompletionStatus.COMPLETED_NO);
+        }
 
         //
         // In Java, the servant needs to be associated with the ORB
@@ -135,9 +136,9 @@
         org.omg.PortableServer.ServantLocator locator;
 
         synchronized (this) {
-            if (servantLocator_ == null)
+            if (servantLocator_ == null) {
                 return;
-
+            }
             locator = servantLocator_;
         }
 

Modified: geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Acceptor_impl.java
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Acceptor_impl.java?rev=641268&r1=641267&r2=641268&view=diff
==============================================================================
--- geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Acceptor_impl.java
(original)
+++ geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Acceptor_impl.java
Wed Mar 26 04:50:17 2008
@@ -471,7 +471,7 @@
             port_ = socket_.getLocalPort();
             logger.fine("Acceptor created using socket " + socket_); 
         } catch (java.net.BindException ex) {
-            logger.log(Level.FINE, "Failure creating server socket for host=" + localAddress_
+ ", port=" + port_, ex);
+            logger.log(Level.FINE, "Failure creating server socket for host=" + localAddress_
+ ", port=" + port, ex);
             throw (org.omg.CORBA.COMM_FAILURE)new org.omg.CORBA.COMM_FAILURE(
                     org.apache.yoko.orb.OB.MinorCodes
                             .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorBind)
@@ -479,7 +479,7 @@
                     org.apache.yoko.orb.OB.MinorCodes.MinorBind,
                     org.omg.CORBA.CompletionStatus.COMPLETED_NO).initCause(ex);
         } catch (java.io.IOException ex) {
-            logger.log(Level.FINE, "Failure creating server socket for host=" + localAddress_
+ ", port=" + port_, ex);
+            logger.log(Level.FINE, "Failure creating server socket for host=" + localAddress_
+ ", port=" + port, ex);
             throw (org.omg.CORBA.COMM_FAILURE)new org.omg.CORBA.COMM_FAILURE(
                     org.apache.yoko.orb.OB.MinorCodes
                             .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorSocket)

Modified: geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Transport_impl.java
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Transport_impl.java?rev=641268&r1=641267&r2=641268&view=diff
==============================================================================
--- geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Transport_impl.java
(original)
+++ geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Transport_impl.java
Wed Mar 26 04:50:17 2008
@@ -332,7 +332,7 @@
     public void send(org.apache.yoko.orb.OCI.Buffer buf, boolean block) {
         setBlock(block);
         
-        logger.fine("Sending buffer of size " + buf.rest_length() + " to " + " using transport
" + this); 
+        logger.fine("Sending buffer of size " + buf.rest_length() + " to " + socket_); 
         
         while (!buf.is_full()) {
             try {
@@ -529,5 +529,9 @@
             close();
 
         super.finalize();
+    }
+    
+    public String toString() {
+        return "iiop transport using socket " + socket_; 
     }
 }

Modified: geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/iiop.java
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/iiop.java?rev=641268&r1=641267&r2=641268&view=diff
==============================================================================
--- geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/iiop.java (original)
+++ geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/iiop.java Wed Mar 26 04:50:17
2008
@@ -17,9 +17,13 @@
 
 package org.apache.yoko.orb.OCI;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import org.apache.yoko.orb.OCI.IIOP.ConnectionHelper;
 
 public class iiop implements PluginInit {
+    static final Logger logger = Logger.getLogger(iiop.class.getName());
     // default settings for loading the connectionHelper "plugin-to-the-plugin"
     private String connectionHelper = "org.apache.yoko.orb.OCI.IIOP.DefaultConnectionHelper";
     private String helperArgs = "";
@@ -92,10 +96,12 @@
                     if (key.equals("org.omg.CORBA.ORBInitialHost")) {
                         host = value; 
                         haveArgs = true; 
+                        logger.fine("Using ORBInitialHost value of " + host); 
                     }
                     else if (key.equals("org.omg.CORBA.ORBInitialPort")) {
                         port = value; 
                         haveArgs = true; 
+                        logger.fine("Using ORBInitialPort value of " + port); 
                     }
                     else if (key.equals("org.omg.CORBA.ORBListenEndpoints")) {
                         // both specified on one property 
@@ -104,6 +110,7 @@
                             host = value.substring(0, sep); 
                             port = value.substring(sep + 1); 
                             haveArgs = true; 
+                            logger.fine("Using ORBListenEndpoints values of " + host + "/"
+ port); 
                         }
                     }
                 }
@@ -113,12 +120,15 @@
                     if (key.equals("yoko.iiop.host")) {
                         host = value;
                         haveArgs = true;
+                        logger.fine("Using yoko.iiop.host value of " + host); 
                     } else if (key.equals("yoko.iiop.numeric")) {
                         numeric = true;
                         haveArgs = true;
+                        logger.fine("Using yoko.iiop.numeric value"); 
                     } else if (key.equals("yoko.iiop.port")) {
                         port = value;
                         haveArgs = true;
+                        logger.fine("Using yoko.iiop.port value of " + port); 
                     } else {
                         throw new org.omg.CORBA.INITIALIZE("iiop: unknown "
                                 + "property " + key);
@@ -227,18 +237,17 @@
             }
 
             if (value == null) {
+                logger.fine("Setting endpoint property " + propName + " to " + str); 
                 props.put(propName, str);
             }
             else {
                 //
                 // Append to existing property value
                 //
+                logger.fine("Setting endpoint property " + propName + " to " + value + ",
" + str); 
                 props.put(propName, value + ", " + str);
             }
         }
-
-
-
 
         //
         // Filter arguments



Mime
View raw message