axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject svn commit: r502337 [3/3] - in /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2: client/ context/ util/
Date Thu, 01 Feb 2007 19:56:03 GMT
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java?view=diff&rev=502337&r1=502336&r2=502337
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java Thu Feb  1 11:56:02 2007
@@ -28,6 +28,7 @@
 
 import javax.xml.namespace.QName;
 
+import org.apache.axiom.om.util.UUIDGenerator;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
@@ -61,6 +62,13 @@
     private static final String myClassName = "OperationContext";
 
     /**
+     * An ID which can be used to correlate operations on an instance of 
+     * this object in the log files
+     */
+    private String logCorrelationIDString = myClassName +"@"+ UUIDGenerator.getUUID();
+    
+
+    /**
      * @serial The serialization version ID tracks the version of the class.
      * If a class definition changes, then the serialization/externalization
      * of the class is affected. If a change to the class is made which is
@@ -237,10 +245,7 @@
      */
     public AxisOperation getAxisOperation() {
         if (needsToBeReconciled && !suppressWarnings) {
-            if (log.isWarnEnabled()) {
-                log.warn(myClassName+":getAxisOperation(): ****WARNING**** OperationContext.activate(configurationContext) needs to be invoked.");
-            }
-            //System.out.println(myClassName+":getAxisOperation(): ****WARNING**** OperationContext.activate(configurationContext) needs to be invoked.");
+            log.warn(logCorrelationIDString+":getAxisOperation(): ****WARNING**** OperationContext.activate(configurationContext) needs to be invoked.");
         }
 
         return axisOperation;
@@ -330,13 +335,6 @@
      */
     public void writeExternal(ObjectOutput out) throws IOException
     {
-        // trace point
-        if (log.isTraceEnabled())
-        {
-            log.trace(myClassName+":writeExternal():  BEGIN  ");
-        }
-        //System.out.println(myClassName+":writeExternal():  BEGIN  ");
-
         //---------------------------------------------------------
         // in order to handle future changes to the message 
         // context definition, be sure to maintain the 
@@ -356,7 +354,9 @@
 
         out.writeBoolean(isComplete);
 
-        ObjectStateUtils.writeString(out, key, "OperationContext.key");
+        ObjectStateUtils.writeString(out, key, logCorrelationIDString+".key");
+
+        ObjectStateUtils.writeString(out, logCorrelationIDString, logCorrelationIDString+".logCorrelationIDString");
 
         //---------------------------------------------------------
         // properties
@@ -370,13 +370,13 @@
             tmpHashMap = new HashMap(tmpMap);
         }
 
-        ObjectStateUtils.writeHashMap(out, tmpHashMap, "OperationContext.properties");
+        ObjectStateUtils.writeHashMap(out, tmpHashMap, logCorrelationIDString+".properties");
 
 
         //---------------------------------------------------------
         // AxisOperation axisOperation
         //---------------------------------------------------------
-        String axisOpMarker = "OperationContext.axisOperation";
+        String axisOpMarker = logCorrelationIDString+".axisOperation";
         ObjectStateUtils.writeString(out, axisOpMarker, axisOpMarker);
 
         if (axisOperation == null)
@@ -387,13 +387,13 @@
         {
         	out.writeBoolean(ObjectStateUtils.ACTIVE_OBJECT);
         	metaAxisOperation = new MetaDataEntry(axisOperation.getClass().getName(), axisOperation.getName().toString());
-        	ObjectStateUtils.writeObject(out, metaAxisOperation, "OperationContext.metaAxisOperation");
+        	ObjectStateUtils.writeObject(out, metaAxisOperation, logCorrelationIDString+".metaAxisOperation");
         }
 
         // save the meta data for the corresponding axis service to better
         // match up the axis operation 
 
-        String axisServMarker = "OperationContext.metaAxisService";
+        String axisServMarker = logCorrelationIDString+".metaAxisService";
         ObjectStateUtils.writeString(out, axisServMarker, axisServMarker);
 
         AxisService axisService = (AxisService) axisOperation.getParent();
@@ -406,7 +406,7 @@
         {
         	out.writeBoolean(ObjectStateUtils.ACTIVE_OBJECT);
         	metaAxisService = new MetaDataEntry(axisService.getClass().getName(), axisService.getName().toString());
-        	ObjectStateUtils.writeObject(out, metaAxisService, "OperationContext.metaAxisService");
+        	ObjectStateUtils.writeObject(out, metaAxisService, logCorrelationIDString+".metaAxisService");
         }
         
 
@@ -415,7 +415,7 @@
         //---------------------------------------------------------
         ServiceContext myParent = (ServiceContext) this.getServiceContext();
 
-        ObjectStateUtils.writeObject(out, myParent, "OperationContext.parent ServiceContext"); 
+        ObjectStateUtils.writeObject(out, myParent, logCorrelationIDString+".parent ServiceContext"); 
 
 
         //---------------------------------------------------------
@@ -504,27 +504,23 @@
 
                 // put the modified entry in the list
                 tmpMsgCtxMap.put(keyObj2,modifiedValue2);
+
+                // trace point
+                log.trace(logCorrelationIDString+":writeExternal():  getting working set entry  key ["+keyObj2+"]   message context ID["+modifiedValue2.getMessageID()+"]");
             }
 
         }
 
-        ObjectStateUtils.writeHashMap(out, tmpMsgCtxMap, "OperationContext.messageContexts modified table");
+        ObjectStateUtils.writeHashMap(out, tmpMsgCtxMap, logCorrelationIDString+".messageContexts working set");
 
         // next, deal with the metadata table of messageContexts
-        ObjectStateUtils.writeHashMap(out, metaMessageContextMap, "OperationContext.metaMessageContextMap metadata table");
+        ObjectStateUtils.writeHashMap(out, metaMessageContextMap, logCorrelationIDString+".metaMessageContextMap metadata table");
 
 
         //---------------------------------------------------------
         // done
         //---------------------------------------------------------
 
-
-        // trace point
-        if (log.isTraceEnabled())
-        {
-            log.trace(myClassName+":writeExternal():  END  ");
-        }
-        //System.out.println(myClassName+":writeExternal():  END  ");
     }
 
 
@@ -548,12 +544,7 @@
         needsToBeReconciled = true;
 
         // trace point
-        if (log.isTraceEnabled())
-        {
-            log.trace(myClassName+":readExternal():  BEGIN  bytes available in stream ["+in.available()+"]  ");
-        }
-        //System.out.println(myClassName+":readExternal():  BEGIN  bytes available in stream ["+in.available()+"]  ");
-
+        log.trace(myClassName+":readExternal():  BEGIN  bytes available in stream ["+in.available()+"]  ");
 
         //---------------------------------------------------------
         // object level identifiers
@@ -589,6 +580,11 @@
 
         key = ObjectStateUtils.readString(in,"OperationContext.key"); 
 
+        logCorrelationIDString = ObjectStateUtils.readString(in, "OperationContext.logCorrelationIDString");
+
+        // trace point
+        log.trace(myClassName+":readExternal():  reading input stream for ["+logCorrelationIDString+"]  ");
+
         //---------------------------------------------------------
         // properties
         //---------------------------------------------------------
@@ -656,20 +652,14 @@
         // set to empty until this can be activiated
         messageContexts = new HashMap();
 
-        workingSet = ObjectStateUtils.readHashMap(in, "OperationContext.messageContexts working set");
+        workingSet = ObjectStateUtils.readHashMap(in, logCorrelationIDString+".messageContexts working set");
 
-        metaMessageContextMap = ObjectStateUtils.readHashMap(in, "OperationContext.metaMessageContextMap metadata table");
+        metaMessageContextMap = ObjectStateUtils.readHashMap(in, logCorrelationIDString+".metaMessageContextMap metadata table");
 
         //---------------------------------------------------------
         // done
         //---------------------------------------------------------
 
-        // trace point
-        if (log.isTraceEnabled())
-        {
-            log.trace(myClassName+":readExternal():  END");
-        }
-        //System.out.println(myClassName+":readExternal():  END");
 
     }
 
@@ -694,14 +684,6 @@
             return;
         }
 
-        // trace point
-        if (log.isTraceEnabled())
-        {
-            log.trace(myClassName+":activate():  BEGIN");
-        }
-        //System.out.println(myClassName+":activate():  BEGIN");
-
-
         // get the axis configuration 
         AxisConfiguration axisConfig = cc.getAxisConfiguration();
 
@@ -813,10 +795,7 @@
             boolean registrationSuceeded = activeCC.registerOperationContext(key, this);
             if(!registrationSuceeded){
                 // trace point
-                if (log.isTraceEnabled())
-                {
-                    log.trace(myClassName+":activate():  OperationContext key ["+key+"] already exists in ConfigurationContext map.  This OperationContext ["+this.toString()+"] was not added to the table.");
-                }
+                log.trace(logCorrelationIDString+":activate():  OperationContext key ["+key+"] already exists in ConfigurationContext map.  This OperationContext ["+this.toString()+"] was not added to the table.");
             }
         }
         
@@ -844,7 +823,8 @@
                 // activate that object 
                 if (value != null)
                 {
-                    //System.out.println(myClassName+":activate():  key ["+keyObj+"]  message id ["+value.getMessageID()+"]");
+                    // trace point
+                    log.trace(logCorrelationIDString+":activate():  key ["+keyObj+"]  message id ["+value.getMessageID()+"]");
 
                     suppressWarnings = true;
                     value.activateWithOperationContext(this);
@@ -868,11 +848,6 @@
         //-------------------------------------------------------
         needsToBeReconciled = false;
 
-        if (log.isTraceEnabled())
-        {
-            log.trace(myClassName+":activate():  END");
-        }
-        //System.out.println(myClassName+":activate():  END");
     }
 
     /**
@@ -942,6 +917,8 @@
                     MetaDataEntry metaData = new MetaDataEntry(value.getClass().getName(), value.getMessageID(), keyObj.toString());
 
                     // put the meta data entry in the list
+                    // note that if the entry was already in the list,
+                    // this will replace that entry
                     metaMessageContextMap.put(keyObj,metaData);
 
                     // don't change the original table - there's potentially lots of areas that 
@@ -955,15 +932,13 @@
                         isolatedMessageContexts = new HashMap();
                     }
 
+                    // note that if the entry was already in the list,
+                    // this will replace that entry
                     isolatedMessageContexts.put(keyObj,value);
 
 
                     // trace point
-                    if (log.isTraceEnabled())
-                    {
-                        log.trace(myClassName+":isolateMessageContext():  set up message context id["+valueID+"]  with key ["+keyObj.toString()+"] from messageContexts table to prepare for serialization.");
-                    }
-                    //System.out.println(myClassName+":isolateMessageContext():  set up message context id["+valueID+"]  with key ["+keyObj.toString()+"] from messageContexts table to prepare for serialization.");
+                    log.trace(logCorrelationIDString+":isolateMessageContext():  set up message context id["+valueID+"]  with key ["+keyObj.toString()+"] from messageContexts table to prepare for serialization.");
 
                     break;
                 }
@@ -986,11 +961,7 @@
         if (needsToBeReconciled == true)
         {
             // nope, need to do the activation first
-            if (log.isTraceEnabled())
-            {
-                log.trace(myClassName+":restoreMessageContext(): *** WARNING : need to invoke activate() prior to restoring the MessageContext to the list.");
-            }
-            //System.out.println(myClassName+":restoreMessageContext(): *** WARNING : need to invoke activate() prior to restoring the MessageContext to the list.");
+            log.trace(logCorrelationIDString+":restoreMessageContext(): *** WARNING : need to invoke activate() prior to restoring the MessageContext to the list.");
 
             return;
         }
@@ -1005,11 +976,7 @@
         if (msgID == null)
         {
             // can't identify message context
-            if (log.isTraceEnabled())
-            {
-                log.trace(myClassName+":restoreMessageContext(): *** WARNING : MessageContext does not have a message ID.");
-            }
-            //System.out.println(myClassName+":restoreMessageContext(): *** WARNING : MessageContext does not have a message ID.");
+            log.trace(logCorrelationIDString+":restoreMessageContext(): *** WARNING : MessageContext does not have a message ID.");
             return;
         }
 
@@ -1047,7 +1014,7 @@
                         // remove the metadata from the metadata table
                         metaMessageContextMap.remove(keyM);
 
-                        //System.out.println(myClassName+":restoreMessageContext():  restored   label ["+label+"]    message ID ["+msg.getMessageID()+"]");
+                        log.trace(logCorrelationIDString+":restoreMessageContext():  restored   label ["+label+"]    message ID ["+msg.getMessageID()+"]");
 
                         break;
                     }
@@ -1190,4 +1157,29 @@
     }
 
 
+    /**
+     * Get the ID associated with this object instance.
+     * 
+     * @return A string that can be output to a log file as an identifier
+     * for this object instance.  It is suitable for matching related log
+     * entries. 
+     */
+    public String getLogCorrelationIDString()
+    {
+        return logCorrelationIDString;
+    }
+
+
+    /**
+     * Trace a warning message, if needed, indicating that this 
+     * object needs to be activated before accessing certain fields.
+     * 
+     * @param methodname The method where the warning occurs
+     */
+    private void checkActivateWarning(String methodname)
+    {
+        if (needsToBeReconciled) {
+            log.warn(logCorrelationIDString+":"+methodname+"(): ****WARNING**** "+myClassName+".activate(configurationContext) needs to be invoked.");
+        }
+    }
 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java?view=diff&rev=502337&r1=502336&r2=502337
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java Thu Feb  1 11:56:02 2007
@@ -17,6 +17,7 @@
 
 package org.apache.axis2.context;
 
+import org.apache.axiom.om.util.UUIDGenerator;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.description.AxisOperation;
@@ -54,6 +55,13 @@
     private static final String myClassName = "ServiceContext";
 
     /**
+     * An ID which can be used to correlate operations on an instance of 
+     * this object in the log files
+     */
+    private String logCorrelationIDString = myClassName +"@"+ UUIDGenerator.getUUID();
+    
+
+    /**
      * @serial The serialization version ID tracks the version of the class.
      * If a class definition changes, then the serialization/externalization
      * of the class is affected. If a change to the class is made which is
@@ -150,35 +158,17 @@
     }
 
     public AxisService getAxisService() {
-        if (needsToBeReconciled) {
-            if (log.isWarnEnabled()) {
-                log.warn(myClassName+":getAxisService(): ****WARNING**** ServiceContext.activate(configurationContext) needs to be invoked.");
-            }
-            //System.out.println(myClassName+":getAxisService(): ****WARNING**** ServiceContext.activate(configurationContext) needs to be invoked.");
-        }
-
+        checkActivateWarning("getAxisService");
         return axisService;
     }
 
     public ConfigurationContext getConfigurationContext() {
-        if (needsToBeReconciled) {
-            if (log.isWarnEnabled()) {
-                log.warn(myClassName+":getConfigurationContext(): ****WARNING**** ServiceContext.activate(configurationContext) needs to be invoked.");
-            }
-            //System.out.println(myClassName+":getConfigurationContext(): ****WARNING**** ServiceContext.activate(configurationContext) needs to be invoked.");
-        }
-
+        checkActivateWarning("getConfigurationContext");
         return configContext;
     }
 
     public ServiceGroupContext getServiceGroupContext() {
-        if (needsToBeReconciled) {
-            if (log.isWarnEnabled()) {
-                log.warn(myClassName+":getServiceGroupContext(): ****WARNING**** ServiceContext.activate(configurationContext) needs to be invoked.");
-            }
-            //System.out.println(myClassName+":getServiceGroupContext(): ****WARNING**** ServiceContext.activate(configurationContext) needs to be invoked.");
-        }
-
+        checkActivateWarning("getServiceGroupContext");
         return serviceGroupContext;
     }
 
@@ -344,12 +334,36 @@
 
         out.writeBoolean(cachingOperationContext);
 
+        ObjectStateUtils.writeString(out, logCorrelationIDString, logCorrelationIDString+".logCorrelationIDString");
 
-        // EndpointReference targetEPR
-        ObjectStateUtils.writeObject(out, targetEPR, "ServiceContext.targetEPR");
+        // put some try..catch blocks around the following objects
+        // so that the writing to the output stream continues
+        // even if one of the objects can't be serialized
 
-        // EndpointReference myEPR
-        ObjectStateUtils.writeObject(out, myEPR, "ServiceContext.myEPR");
+        try
+        {
+            // EndpointReference targetEPR
+            ObjectStateUtils.writeObject(out, targetEPR, "ServiceContext.targetEPR");
+        }
+        catch (Exception e1)
+        {
+            // note that the utility class will provide the trace for the 
+            // exception so we won't have to
+            // so just consume the exception for now
+        }
+
+
+        try
+        {
+            // EndpointReference myEPR
+            ObjectStateUtils.writeObject(out, myEPR, "ServiceContext.myEPR");
+        }
+        catch (Exception e2)
+        {
+            // note that the utility class will provide the trace for the 
+            // exception so we won't have to
+            // so just consume the exception for now
+        }
 
 
         //---------------------------------------------------------
@@ -419,11 +433,7 @@
 
 
         // trace point
-        if (log.isTraceEnabled())
-        {
-            log.trace(myClassName+":readExternal():  BEGIN  bytes available in stream ["+in.available()+"]  ");
-        }
-        //System.out.println(myClassName+":readExternal():  BEGIN  bytes available in stream ["+in.available()+"]  ");
+        log.trace(myClassName+":readExternal():  BEGIN  bytes available in stream ["+in.available()+"]  ");
 
 
         //---------------------------------------------------------
@@ -458,6 +468,12 @@
 
         cachingOperationContext = in.readBoolean();
 
+        logCorrelationIDString = ObjectStateUtils.readString(in, myClassName+".logCorrelationIDString");
+
+        // trace point
+        log.trace(myClassName+":readExternal():  reading input stream for ["+logCorrelationIDString+"]  ");
+
+
         // EndpointReference targetEPR
         targetEPR = (EndpointReference) ObjectStateUtils.readObject(in, "ServiceContext.targetEPR");
 
@@ -518,14 +534,6 @@
         //---------------------------------------------------------
         // done
         //---------------------------------------------------------
-
-        // trace point
-        if (log.isTraceEnabled())
-        {
-            log.trace(myClassName+":readExternal():  END");
-        }
-        //System.out.println(myClassName+":readExternal():  END");
-
     }
 
     
@@ -549,14 +557,6 @@
             return;
         }
 
-        // trace point
-        if (log.isTraceEnabled())
-        {
-            log.trace(myClassName+":activate():  BEGIN");
-        }
-        //System.out.println(myClassName+":activate():  BEGIN");
-
-
         // use the supplied configuration context
         configContext = cc;
 
@@ -642,11 +642,6 @@
             metaParent.addServiceContext(this);
         }
 
-        if (log.isTraceEnabled())
-        {
-            log.trace(myClassName+":activate():  END");
-        }
-        //System.out.println(myClassName+":activate():  END");
     }
 
     /**                         
@@ -761,4 +756,30 @@
         return true;
     }
 
+
+    /**
+     * Get the ID associated with this object instance.
+     * 
+     * @return A string that can be output to a log file as an identifier
+     * for this object instance.  It is suitable for matching related log
+     * entries. 
+     */
+    public String getLogCorrelationIDString()
+    {
+        return logCorrelationIDString;
+    }
+
+
+    /**
+     * Trace a warning message, if needed, indicating that this 
+     * object needs to be activated before accessing certain fields.
+     * 
+     * @param methodname The method where the warning occurs
+     */
+    private void checkActivateWarning(String methodname)
+    {
+        if (needsToBeReconciled) {
+            log.warn(logCorrelationIDString+":"+methodname+"(): ****WARNING**** "+myClassName+".activate(configurationContext) needs to be invoked.");
+        }
+    }
 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java?view=diff&rev=502337&r1=502336&r2=502337
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java Thu Feb  1 11:56:02 2007
@@ -116,13 +116,7 @@
     }
 
     public AxisServiceGroup getDescription() {
-        if (needsToBeReconciled) {
-            if (log.isWarnEnabled()) {
-                log.warn(myClassName+":getDescription(): ****WARNING**** ServiceGroupContext.activate(configurationContext) needs to be invoked.");
-            }
-            //System.out.println(myClassName+":getDescription(): ****WARNING**** ServiceGroupContext.activate(configurationContext) needs to be invoked.");
-        }
-
+        checkActivateWarning("getDescription");
         return axisServiceGroup;
     }
 
@@ -480,13 +474,6 @@
         // done
         //---------------------------------------------------------
 
-        // trace point
-        if (log.isTraceEnabled())
-        {
-            log.trace(myClassName+":readExternal():  END");
-        }
-        //System.out.println(myClassName+":readExternal():  END");
-
     }
 
     
@@ -506,15 +493,6 @@
             return;
         }
 
-        // trace point
-        if (log.isTraceEnabled())
-        {
-            log.trace(myClassName+":activate():  BEGIN");
-        }
-        //System.out.println(myClassName+":activate():  BEGIN");
-
-
-
         // get the axis configuration 
         AxisConfiguration axisConfig = cc.getAxisConfiguration();
 
@@ -539,11 +517,6 @@
         //-------------------------------------------------------
         needsToBeReconciled = false;
 
-        if (log.isTraceEnabled())
-        {
-            log.trace(myClassName+":activate():  END");
-        }
-        //System.out.println(myClassName+":activate():  END");
     }
 
     /**
@@ -598,5 +571,18 @@
         // TODO: consider checking fields from the super class for equivalency
 
         return true;
+    }
+
+    /**
+     * Trace a warning message, if needed, indicating that this 
+     * object needs to be activated before accessing certain fields.
+     * 
+     * @param methodname The method where the warning occurs
+     */
+    private void checkActivateWarning(String methodname)
+    {
+        if (needsToBeReconciled) {
+            log.warn(myClassName+":"+methodname+"(): ****WARNING**** "+myClassName+".activate(configurationContext) needs to be invoked.");
+        }
     }
 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ObjectStateUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ObjectStateUtils.java?view=diff&rev=502337&r1=502336&r2=502337
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ObjectStateUtils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ObjectStateUtils.java Thu Feb  1 11:56:02 2007
@@ -178,8 +178,6 @@
                 log.trace("ObjectStateUtils:writeString(): ACTIVE string: str_desc ["+str_desc+"]    string ["+str+"]   desc ["+desc+"]   output byte buffer size ["+outSize+"]");
                 log.trace("ObjectStateUtils:writeString(): ACTIVE string: outBuffer ["+outBuffer.toString()+"]");
             }
-            //System.out.println("ObjectStateUtils:writeString(): ACTIVE string: str_desc ["+str_desc+"]    string ["+str+"]   desc ["+desc+"]   output byte buffer size ["+outSize+"]");
-            //System.out.println("ObjectStateUtils:writeString(): ACTIVE string: outBuffer ["+outBuffer.toString()+"]");
 
         }
         else
@@ -195,7 +193,6 @@
             //  {
             //      log.trace("ObjectStateUtils:writeString(): EMPTY String    desc ["+desc+"]  ");
             //  }
-            //  //System.out.println("ObjectStateUtils:writeString(): EMPTY String   desc ["+desc+"]  ");
         }
 
     }
@@ -248,8 +245,6 @@
                 {
                     log.trace("ObjectStateUtils:readString(): ACTIVE string: the ["+desc+"] string with saved description ["+str_desc+"] has ["+numberStringSections+"] sections");
                 }
-                //System.out.println("ObjectStateUtils:readString(): ACTIVE string: the ["+desc+"] string with saved description ["+str_desc+"] has ["+numberStringSections+"] sections");
-
 
                 // TODO: read the sections and concatenate them together
                 //       may need to adjust the saved information to make 
@@ -282,8 +277,6 @@
                 {
                     log.trace("ObjectStateUtils:readString(): ACTIVE string: str_desc ["+str_desc+"]    bufSize ["+bufSize+"]   bytesRead ["+bytesRead+"]   desc ["+desc+"]");
                 }
-                //System.out.println("ObjectStateUtils:readString(): ACTIVE string: str_desc ["+str_desc+"]    bufSize ["+bufSize+"]   bytesRead ["+bytesRead+"]   desc ["+desc+"]");
-
 
                 if (bytesRead > 0)
                 {
@@ -323,9 +316,8 @@
 
         if (log.isTraceEnabled())
         {
-            log.trace("ObjectStateUtils:readString(): ["+desc+"]  returning  ["+value+"]");
+            log.trace("ObjectStateUtils:readString(): ["+desc+"]  returning  ["+value+"]  for  saved ["+str_desc+"]");
         }
-        //System.out.println("ObjectStateUtils:readString(): ["+desc+"]  returning  ["+value+"]");
 
         return str;
     }
@@ -396,7 +388,6 @@
                 if (log.isTraceEnabled())
                 {
                     log.trace("ObjectStateUtils:writeObject(): object["+obj.getClass().getName()+"]  ***Exception***  ["+exc2.getClass().getName()+" : "+exc2.getMessage()+"]  "+OBJ_SAVE_PROBLEM, exc2);
-                    //System.out.println("ObjectStateUtils:writeObject(): object["+obj.getClass().getName()+"]  ***Exception***  ["+exc.getClass().getName()+" : "+exc.getMessage()+"]  "+OBJ_SAVE_PROBLEM);
                     //exc2.printStackTrace();
                 }
             }
@@ -413,7 +404,6 @@
                     {
                         log.trace("ObjectStateUtils:writeObject(): Object ["+objClassName+"]  desc ["+desc+"]");
                     }
-                    //System.out.println("ObjectStateUtils:writeObject(): Object ["+objClassName+"]  desc ["+desc+"]");
                 }
                 catch (NotSerializableException nse)
                 {
@@ -430,7 +420,6 @@
                     if (log.isTraceEnabled())
                     {
                         log.trace("ObjectStateUtils:writeObject(): object["+obj.getClass().getName()+"]  ***Exception***  ["+exc.getClass().getName()+" : "+exc.getMessage()+"]  "+OBJ_SAVE_PROBLEM, exc);
-                        //System.out.println("ObjectStateUtils:writeObject(): object["+obj.getClass().getName()+"]  ***Exception***  ["+exc.getClass().getName()+" : "+exc.getMessage()+"]  "+OBJ_SAVE_PROBLEM);
                         //exc.printStackTrace();
                     }
                 }
@@ -456,13 +445,11 @@
 
             out.writeBoolean(EMPTY_OBJECT);
 
-            // for now, don't trace the EMPTY lines
-            //  // trace point
-            //  if (log.isTraceEnabled())
-            //  {
-            //      log.trace("ObjectStateUtils:writeObject(): EMPTY Object ["+desc+"]  ");
-            //  }
-            //  //System.out.println("ObjectStateUtils:writeObject(): EMPTY Object ["+desc+"]  ");
+            // trace point
+            if (log.isTraceEnabled())
+            {
+                log.trace("ObjectStateUtils:writeObject(): EMPTY Object ["+desc+"]  ");
+            }
         }
     }
 
@@ -547,7 +534,7 @@
                     // trace the inconsistency
                     if (log.isTraceEnabled())
                     {
-                        log.trace("ObjectStateUtils:readObject(): Inconsistent results reading the stream for ["+desc+"]  ");
+                        log.trace("ObjectStateUtils:readObject(): Inconsistent results reading the stream for ["+desc+"]  for saved ["+str_desc+"]");
                     }
                     //System.trace.println("ObjectStateUtils:readObject(): Inconsistent results reading the stream for ["+desc+"]  ");
                 }
@@ -559,15 +546,14 @@
 
         if (obj != null)
         {
-            value = str_desc + ":" + obj.getClass().getName();
+            value = "("+str_desc+")" + ":" + obj.getClass().getName();
         }
 
         // trace point
         if (log.isTraceEnabled())
         {
-            log.trace("ObjectStateUtils:readObject(): ["+desc+"]  returning  ["+value+"]");
+            log.trace("ObjectStateUtils:readObject(): ["+desc+"]  returning  ["+value+"]   for saved ["+str_desc+"]");
         }
-        //System.out.println("ObjectStateUtils:readObject(): ["+desc+"]  returning  ["+value+"]");
 
         return obj;
     }
@@ -618,13 +604,11 @@
 
             out.writeBoolean(EMPTY_OBJECT);
 
-            // for now, don't trace the EMPTY lines
-            //  // trace point
-            //  if (log.isTraceEnabled())
-            //  {
-            //      log.trace("ObjectStateUtils:writeArrayList(): EMPTY List ["+desc+"]  ");
-            //  }
-            //  //System.out.println("ObjectStateUtils:writeArrayList(): EMPTY List ["+desc+"]  ");
+            // trace point
+            if (log.isTraceEnabled())
+            {
+                log.trace("ObjectStateUtils:writeArrayList(): EMPTY List ["+desc+"]  ");
+            }
         }
         else
         {
@@ -672,7 +656,6 @@
                     if (log.isTraceEnabled())
                     {
                         log.trace("ObjectStateUtils:writeArrayList(): object["+obj.getClass().getName()+"]  ***Exception***  ["+exc.getClass().getName()+" : "+exc.getMessage()+"]  "+OBJ_SAVE_PROBLEM, exc);
-                        //System.out.println("ObjectStateUtils:writeArrayList(): object["+obj.getClass().getName()+"]  ***Exception***  ["+exc.getClass().getName()+" : "+exc.getMessage()+"]  "+OBJ_SAVE_PROBLEM);
                         //exc.printStackTrace();
                     }
                 }
@@ -690,7 +673,6 @@
                         {
                             log.trace("ObjectStateUtils:writeArrayList(): "+desc+" ["+obj.getClass().getName()+"]");
                         }
-                        //System.out.println("ObjectStateUtils:writeArrayList(): "+desc+" ["+obj.getClass().getName()+"]");
 
                     }
                     catch (NotSerializableException nse)
@@ -706,7 +688,6 @@
                         if (log.isTraceEnabled())
                         {
                             log.trace("ObjectStateUtils:writeArrayList(): "+desc+" ["+obj.getClass().getName()+"]  ***Exception***  ["+ex.getClass().getName()+" : "+ex.getMessage()+"]  "+OBJ_SAVE_PROBLEM, ex);
-                            //System.out.println("ObjectStateUtils:writeArrayList(): "+desc+" ["+obj.getClass().getName()+"]  ***Exception***  ["+ex.getClass().getName()+" : "+ex.getMessage()+"]");
                             //ex.printStackTrace();
                         }
                     }
@@ -727,7 +708,6 @@
             {
                 log.trace("ObjectStateUtils:writeArrayList(): List ["+desc+"]   members saved ["+savedListSize+"]");
             }
-            //System.out.println("ObjectStateUtils:writeArrayList(): List ["+desc+"]   members saved ["+savedListSize+"]");
 
             test_outBuffer.close();
             test_objOut.close();
@@ -827,9 +807,8 @@
                             // trace point
                             if (log.isTraceEnabled())
                             {
-                                log.trace("ObjectStateUtils:readArrayList(): ["+desc+"]  index ["+count+"]  object ["+tmpClassName+"] ");
+                                log.trace("ObjectStateUtils:readArrayList(): ["+desc+"]  index ["+count+"]  object ["+tmpClassName+"]   for saved ["+str_desc+"]");
                             }
-                            //System.out.println("ObjectStateUtils:readArrayList(): ["+desc+"]  index ["+count+"]  object ["+tmpClassName+"]  ");
                         }
                     }
                     else
@@ -839,9 +818,8 @@
                         // trace point
                         if (log.isTraceEnabled())
                         {
-                            log.trace("ObjectStateUtils:readArrayList(): ["+desc+"]  object index ["+count+"] ***Unexpected null object***");
+                            log.trace("ObjectStateUtils:readArrayList(): ["+desc+"]  object index ["+count+"] ***Unexpected null object***   for saved ["+str_desc+"]");
                         }
-                        //System.out.println("ObjectStateUtils:readArrayList(): ["+desc+"]  object index ["+count+"] ***Unexpected null object***");
                         keepGoing = false;
                     }
                 }
@@ -852,8 +830,7 @@
                     // trace point
                     if (log.isTraceEnabled())
                     {
-                        log.trace("ObjectStateUtils:readArrayList(): ["+desc+"]  object index ["+count+"] ***Exception***  ["+ex.getClass().getName()+" : "+ex.getMessage()+"]  "+OBJ_RESTORE_PROBLEM, ex);
-                        //System.out.println("ObjectStateUtils:readArrayList(): ["+desc+"]  object index ["+count+"] ***Exception***  ["+ex.getClass().getName()+" : "+ex.getMessage()+"]  "+OBJ_RESTORE_PROBLEM);
+                        log.trace("ObjectStateUtils:readArrayList(): ["+desc+"]  object index ["+count+"]   for saved ["+str_desc+"]  ***Exception***  ["+ex.getClass().getName()+" : "+ex.getMessage()+"]  "+OBJ_RESTORE_PROBLEM, ex);
                         //ex.printStackTrace();
                     }
 
@@ -867,20 +844,17 @@
             // trace point
             if (log.isTraceEnabled())
             {
-                log.trace("ObjectStateUtils:readArrayList(): adjusted number of entries ["+adjustedNumberEntries+"]    ");
+                log.trace("ObjectStateUtils:readArrayList(): adjusted number of entries ["+adjustedNumberEntries+"]     for saved ["+str_desc+"] ");
             }
-            //System.out.println("ObjectStateUtils:readArrayList(): adjusted number of entries ["+adjustedNumberEntries+"]    ");
 
 
             if (list.isEmpty())
             {
-                // for now, don't trace the EMPTY lines
-                //  // trace point
-                //  if (log.isTraceEnabled())
-                //  {
-                //      log.trace("ObjectStateUtils:readArrayList(): ["+desc+"]  returning  [null]");
-                //  }
-                //  //System.out.println("ObjectStateUtils:readArrayList(): ["+desc+"]  returning  [null]");
+                // trace point
+                if (log.isTraceEnabled())
+                {
+                    log.trace("ObjectStateUtils:readArrayList(): ["+desc+"]  returning  [null]  for saved ["+str_desc+"]");
+                }
 
                 return null;
             }
@@ -889,9 +863,8 @@
                 // trace point
                 if (log.isTraceEnabled())
                 {
-                    log.trace("ObjectStateUtils:readArrayList(): ["+desc+"]  returning  [listsize="+list.size()+"]");
+                    log.trace("ObjectStateUtils:readArrayList(): ["+desc+"]  returning  [listsize="+list.size()+"]  for saved ["+str_desc+"]");
                 }
-                //System.out.println("ObjectStateUtils:readArrayList(): ["+desc+"]  returning  [listsize="+list.size()+"]");
 
                 return list;
             }
@@ -901,9 +874,8 @@
             // trace point
             if (log.isTraceEnabled())
             {
-                log.trace("ObjectStateUtils:readArrayList(): ["+desc+"]  returning  [null]");
+                log.trace("ObjectStateUtils:readArrayList(): ["+desc+"]  returning  [null]    for saved ["+str_desc+"]");
             }
-            //System.out.println("ObjectStateUtils:readArrayList(): ["+desc+"]  returning  [null]");
 
             return null;
         }
@@ -955,13 +927,11 @@
 
             out.writeBoolean(EMPTY_OBJECT);
 
-            // for now, don't trace the EMPTY lines
-            //  // trace point
-            //  if (log.isTraceEnabled())
-            //  {
-            //      log.trace("ObjectStateUtils:writeHashMap(): EMPTY map ["+desc+"]  ");
-            //  } 
-            //  //System.out.println("ObjectStateUtils:writeHashMap(): EMPTY map ["+desc+"]  ");
+            // trace point
+            if (log.isTraceEnabled())
+            {
+                log.trace("ObjectStateUtils:writeHashMap(): EMPTY map ["+desc+"]  ");
+            } 
         }
         else
         {
@@ -1022,7 +992,6 @@
                         if (log.isTraceEnabled())
                         {
                             log.trace("ObjectStateUtils:writeHashMap(): map value ["+value.getClass().getName()+"]  ***Exception***  ["+ex.getClass().getName()+" : "+ex.getMessage()+"]  "+OBJ_SAVE_PROBLEM, ex);
-                            //System.out.println("ObjectStateUtils:writeHashMap(): map value ["+value.getClass().getName()+"]  ***Exception***  ["+ex.getClass().getName()+" : "+ex.getMessage()+"]  "+OBJ_SAVE_PROBLEM);
                             //ex.printStackTrace();
                         }
                     }
@@ -1040,7 +1009,6 @@
                     if (log.isTraceEnabled())
                     {
                         log.trace("ObjectStateUtils:writeHashMap(): map key ["+key.getClass().getName()+"]  ***Exception***  ["+exc.getClass().getName()+" : "+exc.getMessage()+"]  "+OBJ_SAVE_PROBLEM, exc);
-                        //System.out.println("ObjectStateUtils:writeHashMap(): map key ["+key.getClass().getName()+"]  ***Exception***  ["+exc.getClass().getName()+" : "+exc.getMessage()+"]  "+OBJ_SAVE_PROBLEM);
                         //exc.printStackTrace();
                     }
                 }
@@ -1075,7 +1043,6 @@
                             if (log.isTraceEnabled())
                             {
                                 log.trace("ObjectStateUtils:writeHashMap(): output error: map value ["+value.getClass().getName()+"]  ***Exception***  ["+excp.getClass().getName()+" : "+excp.getMessage()+"]  "+OBJ_SAVE_PROBLEM, excp);
-                                //System.out.println("ObjectStateUtils:writeHashMap(): output error: map value ["+value.getClass().getName()+"]  ***Exception***  ["+excp.getClass().getName()+" : "+excp.getMessage()+"]  "+OBJ_SAVE_PROBLEM);
                                 //excp.printStackTrace();
                             }
 
@@ -1099,7 +1066,6 @@
                         if (log.isTraceEnabled())
                         {
                             log.trace("ObjectStateUtils:writeHashMap(): output error: map key ["+key.getClass().getName()+"]  ***Exception***  ["+ex.getClass().getName()+" : "+ex.getMessage()+"]  "+OBJ_SAVE_PROBLEM, ex);
-                            //System.out.println("ObjectStateUtils:writeHashMap(): output error: map key ["+key.getClass().getName()+"]  ***Exception***  ["+ex.getClass().getName()+" : "+ex.getMessage()+"]  "+OBJ_SAVE_PROBLEM);
                             //ex.printStackTrace();
                         }
                     }
@@ -1122,7 +1088,6 @@
             {
                 log.trace("ObjectStateUtils:writeHashMap(): map ["+desc+"]   members saved ["+savedListSize+"]");
             }
-            //System.out.println("ObjectStateUtils:writeHashMap(): map ["+desc+"]   members saved ["+savedListSize+"]");
 
             pair_outBuffer.close();
             pair_objOut.close();
@@ -1235,9 +1200,8 @@
                             // trace point
                             if (log.isTraceEnabled())
                             {
-                                log.trace("ObjectStateUtils:readHashMap(): ["+desc+"]  object pair index ["+obtainedListSize+"]  will be skipped because the value object is unavailable.");
+                                log.trace("ObjectStateUtils:readHashMap(): ["+desc+"]  object pair index ["+obtainedListSize+"]  will be skipped because the value object is unavailable.    For saved ["+str_desc+"]");
                             }
-                            //System.out.println("ObjectStateUtils:readHashMap(): ["+desc+"]  object pair index ["+obtainedListSize+"]  will be skipped because the value object is unavailable.");
                         }
                         else if (tmpvalue.equalsIgnoreCase(NULL_OBJECT) == true)
                         {
@@ -1252,9 +1216,8 @@
                         // trace point
                         if (log.isTraceEnabled())
                         {
-                            log.trace("ObjectStateUtils:readHashMap(): ["+desc+"]  object pair index ["+obtainedListSize+"] ");
+                            log.trace("ObjectStateUtils:readHashMap(): ["+desc+"]  object pair index ["+obtainedListSize+"]   for saved ["+str_desc+"]");
                         }
-                        //System.out.println("ObjectStateUtils:readHashMap(): ["+desc+"]  object pair index ["+obtainedListSize+"] ");
                     }
 
                     obtainedListSize++;
@@ -1267,8 +1230,7 @@
                     // trace point
                     if (log.isTraceEnabled())
                     {
-                        log.trace("ObjectStateUtils:readHashMap(): ["+desc+"]  object pair index ["+obtainedListSize+"] ***Exception***  ["+ex.getClass().getName()+" : "+ex.getMessage()+"]  "+OBJ_RESTORE_PROBLEM,ex);
-                        //System.out.println("ObjectStateUtils:readHashMap(): ["+desc+"]  object pair index ["+obtainedListSize+"] ***Exception***  ["+ex.getClass().getName()+" : "+ex.getMessage()+"]  "+OBJ_RESTORE_PROBLEM);
+                        log.trace("ObjectStateUtils:readHashMap(): ["+desc+"]  object pair index ["+obtainedListSize+"]   for saved ["+str_desc+"] ***Exception***  ["+ex.getClass().getName()+" : "+ex.getMessage()+"]  "+OBJ_RESTORE_PROBLEM,ex);
                         //ex.printStackTrace();
                     }
                 }
@@ -1281,13 +1243,11 @@
 
             if (map.isEmpty())
             {
-                // for now, don't trace the EMPTY lines
-                //  // trace point
-                //  if (log.isTraceEnabled())
-                //  {
-                //      log.trace("ObjectStateUtils:readHashMap(): ["+desc+"]  returning  [null]");
-                //  }
-                //  //System.out.println("ObjectStateUtils:readHashMap(): ["+desc+"]  returning  [null]");
+                // trace point
+                if (log.isTraceEnabled())
+                {
+                    log.trace("ObjectStateUtils:readHashMap(): ["+desc+"]  returning  [null]  for saved ["+str_desc+"]");
+                }
 
                 return null;
             }
@@ -1296,9 +1256,8 @@
                 // trace point
                 if (log.isTraceEnabled())
                 {
-                    log.trace("ObjectStateUtils:readHashMap(): ["+desc+"]  returning  [mapsize="+map.size()+"]");
+                    log.trace("ObjectStateUtils:readHashMap(): ["+desc+"]  returning  [mapsize="+map.size()+"]    for saved ["+str_desc+"]");
                 }
-                //System.out.println("ObjectStateUtils:readHashMap(): ["+desc+"]  returning  [mapsize="+map.size()+"]");
 
                 return map;
             }
@@ -1309,9 +1268,8 @@
             // trace point
             if (log.isTraceEnabled())
             {
-                log.trace("ObjectStateUtils:readHashMap(): ["+desc+"]  returning  [null]");
+                log.trace("ObjectStateUtils:readHashMap(): ["+desc+"]  returning  [null]    for saved ["+str_desc+"]");
             }
-            //System.out.println("ObjectStateUtils:readHashMap(): ["+desc+"]  returning  [null]");
 
             return null;
         }
@@ -1363,13 +1321,10 @@
 
             out.writeBoolean(EMPTY_OBJECT);
 
-            // for now, don't trace the EMPTY lines
-            //  // trace point
-            //  if (log.isTraceEnabled())
-            //  {
-            //      log.trace("ObjectStateUtils:writeLinkedList(): EMPTY List ["+desc+"]  ");
-            //  }
-            //  //System.out.println("ObjectStateUtils:writeLinkedList(): EMPTY List ["+desc+"]  ");
+            if (log.isTraceEnabled())
+            {
+                log.trace("ObjectStateUtils:writeLinkedList(): EMPTY List ["+desc+"]  ");
+            }
         }
         else
         {
@@ -1417,7 +1372,6 @@
                     if (log.isTraceEnabled())
                     {
                         log.trace("ObjectStateUtils:writeLinkedList(): object["+obj.getClass().getName()+"]  ***Exception***  ["+exc.getClass().getName()+" : "+exc.getMessage()+"]  "+OBJ_SAVE_PROBLEM, exc);
-                        //System.out.println("ObjectStateUtils:writeLinkedList(): object["+obj.getClass().getName()+"]  ***Exception***  ["+exc.getClass().getName()+" : "+exc.getMessage()+"]  "+OBJ_SAVE_PROBLEM);
                         //exc.printStackTrace();
                     }
                 }
@@ -1435,7 +1389,6 @@
                         {
                             log.trace("ObjectStateUtils:writeLinkedList(): "+desc+" ["+obj.getClass().getName()+"]");
                         }
-                        //System.out.println("ObjectStateUtils:writeLinkedList(): "+desc+" ["+obj.getClass().getName()+"]");
 
                     }
                     catch (NotSerializableException nse)
@@ -1451,7 +1404,6 @@
                         if (log.isTraceEnabled())
                         {
                             log.trace("ObjectStateUtils:writeLinkedList(): "+desc+" ["+obj.getClass().getName()+"]  ***Exception***  ["+ex.getClass().getName()+" : "+ex.getMessage()+"] "+OBJ_SAVE_PROBLEM, ex);
-                            //System.out.println("ObjectStateUtils:writeLinkedList(): "+desc+" ["+obj.getClass().getName()+"]  ***Exception***  ["+ex.getClass().getName()+" : "+ex.getMessage()+"] "+OBJ_SAVE_PROBLEM);
                             //ex.printStackTrace();
                         }
                     }
@@ -1472,7 +1424,6 @@
             {
                 log.trace("ObjectStateUtils:writeLinkedList(): List ["+desc+"]   members saved ["+savedListSize+"]");
             }
-            //System.out.println("ObjectStateUtils:writeLinkedList(): List ["+desc+"]   members saved ["+savedListSize+"]");
 
             test_outBuffer.close();
             test_objOut.close();
@@ -1572,9 +1523,8 @@
                             // trace point
                             if (log.isTraceEnabled())
                             {
-                                log.trace("ObjectStateUtils:readLinkedList(): ["+desc+"]  index ["+count+"]  object ["+tmpClassName+"] ");
+                                log.trace("ObjectStateUtils:readLinkedList(): ["+desc+"]  index ["+count+"]  object ["+tmpClassName+"]   for saved ["+str_desc+"]");
                             }
-                            //System.out.println("ObjectStateUtils:readLinkedList(): ["+desc+"]  index ["+count+"]  object ["+tmpClassName+"]  ");
                         }
                     }
                     else
@@ -1584,9 +1534,8 @@
                         // trace point
                         if (log.isTraceEnabled())
                         {
-                            log.trace("ObjectStateUtils:readLinkedList(): ["+desc+"]  object index ["+count+"] ***Unexpected null object***");
+                            log.trace("ObjectStateUtils:readLinkedList(): ["+desc+"]  object index ["+count+"] ***Unexpected null object***   for saved ["+str_desc+"]");
                         }
-                        //System.out.println("ObjectStateUtils:readLinkedList(): ["+desc+"]  object index ["+count+"] ***Unexpected null object***");
                         keepGoing = false;
                     }
                 }
@@ -1597,8 +1546,7 @@
                     // trace point
                     if (log.isTraceEnabled())
                     {
-                        log.trace("ObjectStateUtils:readLinkedList(): ["+desc+"]  object index ["+count+"] ***Exception***  ["+ex.getClass().getName()+" : "+ex.getMessage()+"]  "+OBJ_RESTORE_PROBLEM,ex);
-                        //System.out.print("ObjectStateUtils:readLinkedList(): ["+desc+"]  object index ["+count+"] ***Exception***  ["+ex.getClass().getName()+" : "+ex.getMessage()+"]  "+OBJ_RESTORE_PROBLEM);
+                        log.trace("ObjectStateUtils:readLinkedList(): ["+desc+"]  object index ["+count+"]   for saved ["+str_desc+"] ***Exception***  ["+ex.getClass().getName()+" : "+ex.getMessage()+"]  "+OBJ_RESTORE_PROBLEM,ex);
                         //ex.printStackTrace();
                     }
 
@@ -1612,20 +1560,17 @@
             // trace point
             if (log.isTraceEnabled())
             {
-                log.trace("ObjectStateUtils:readLinkedList(): adjusted number of entries ["+adjustedNumberEntries+"]    ");
+                log.trace("ObjectStateUtils:readLinkedList(): adjusted number of entries ["+adjustedNumberEntries+"]     for saved ["+str_desc+"] ");
             }
-            //System.out.println("ObjectStateUtils:readLinkedList(): adjusted number of entries ["+adjustedNumberEntries+"]    ");
 
 
             if (list.isEmpty())
             {
-                // for now, don't trace the EMPTY lines
-                //  // trace point
-                //  if (log.isTraceEnabled())
-                //  {
-                //      log.trace("ObjectStateUtils:readLinkedList(): ["+desc+"]  returning  [null]");
-                //  }
-                //  //System.out.println("ObjectStateUtils:readLinkedList(): ["+desc+"]  returning  [null]");
+                // trace point
+                if (log.isTraceEnabled())
+                {
+                    log.trace("ObjectStateUtils:readLinkedList(): ["+desc+"]  returning  [null]  for saved ["+str_desc+"]");
+                }
 
                 return null;
             }
@@ -1634,9 +1579,8 @@
                 // trace point
                 if (log.isTraceEnabled())
                 {
-                    log.trace("ObjectStateUtils:readLinkedList(): ["+desc+"]  returning  [listsize="+list.size()+"]");
+                    log.trace("ObjectStateUtils:readLinkedList(): ["+desc+"]  returning  [listsize="+list.size()+"]   for saved ["+str_desc+"]");
                 }
-                //System.out.println("ObjectStateUtils:readLinkedList(): ["+desc+"]  returning  [listsize="+list.size()+"]");
 
                 return list;
             }
@@ -1646,9 +1590,8 @@
             // trace point
             if (log.isTraceEnabled())
             {
-                log.trace("ObjectStateUtils:readLinkedList(): ["+desc+"]  returning  [null]");
+                log.trace("ObjectStateUtils:readLinkedList(): ["+desc+"]  returning  [null]   for saved ["+str_desc+"]");
             }
-            //System.out.println("ObjectStateUtils:readLinkedList(): ["+desc+"]  returning  [null]");
 
             return null;
         }
@@ -1697,7 +1640,6 @@
                     {
                         log.trace("ObjectStateUtils:findOperation(axisCfg): returning  ["+opClassName+"]   ["+opQName.toString()+"]");
                     }
-                    //System.out.println("ObjectStateUtils:findOperation(axisCfg): returning  ["+opClassName+"]   ["+opQName.toString()+"]");
 
                     return operation;
                 }
@@ -1709,7 +1651,6 @@
         {
             log.trace("ObjectStateUtils:findOperation(axisCfg): ["+opClassName+"]   ["+opQName.toString()+"]  returning  [null]");
         }
-        //System.out.println("ObjectStateUtils:findOperation(axisCfg): ["+opClassName+"]   ["+opQName.toString()+"]  returning  [null]");
 
         return null;
     }
@@ -1749,7 +1690,6 @@
                 {
                     log.trace("ObjectStateUtils:findOperation(service): returning  ["+opClassName+"]   ["+opQName.toString()+"]");
                 }
-                //System.out.println("ObjectStateUtils:findOperation(service): returning  ["+opClassName+"]   ["+opQName.toString()+"]");
 
                 return operation;
             }
@@ -1760,7 +1700,6 @@
         {
             log.trace("ObjectStateUtils:findOperation(service): ["+opClassName+"]   ["+opQName.toString()+"]  returning  [null]");
         }
-        //System.out.println("ObjectStateUtils:findOperation(service): ["+opClassName+"]   ["+opQName.toString()+"]  returning  [null]");
 
         return null;
     }
@@ -1798,7 +1737,6 @@
                 {
                     log.trace("ObjectStateUtils:findService(): returning  ["+serviceClassName+"]   ["+serviceName+"]");
                 }
-                //System.out.println("ObjectStateUtils:findService(): returning  ["+serviceClassName+"]   ["+serviceName+"]");
 
                 return service;
             }
@@ -1809,7 +1747,6 @@
         {
             log.trace("ObjectStateUtils:findService(): ["+serviceClassName+"]   ["+serviceName+"]  returning  [null]");
         }
-        //System.out.println("ObjectStateUtils:findService(): ["+serviceClassName+"]   ["+serviceName+"]  returning  [null]");
 
         return null;
     }
@@ -1862,7 +1799,6 @@
                     {
                         log.trace("ObjectStateUtils:findServiceGroup(): returning  ["+serviceGrpClassName+"]   ["+serviceGrpName+"]");
                     }
-                    //System.out.println("ObjectStateUtils:findServiceGroup(): returning  ["+serviceGrpClassName+"]   ["+serviceGrpName+"]");
 
                     return serviceGroup;
                 }
@@ -1874,7 +1810,6 @@
         {
             log.trace("ObjectStateUtils:findServiceGroup(): ["+serviceGrpClassName+"]   ["+serviceGrpName+"]  returning  [null]");
         }
-        //System.out.println("ObjectStateUtils:findServiceGroup(): ["+serviceGrpClassName+"]   ["+serviceGrpName+"]  returning  [null]");
 
         return null;
     }
@@ -1905,7 +1840,6 @@
             {
                 log.trace("ObjectStateUtils:findMessage(): ["+msgName+"]  ["+msgElementName+"] returning  [null] - no AxisOperation");
             }
-            //System.out.println("ObjectStateUtils:findMessage(): ["+msgName+"]  ["+msgElementName+"] returning  [null] - no AxisOperation");
 
             return null;
         }
@@ -1918,7 +1852,6 @@
             {
                 log.trace("ObjectStateUtils:findMessage(): ["+msgName+"]  ["+msgElementName+"] returning  [null] - message name is not set");
             }
-            //System.out.println("ObjectStateUtils:findMessage(): ["+msgName+"]  ["+msgElementName+"] returning  [null] - message name is not set");
 
             return null;
         }
@@ -1962,7 +1895,6 @@
             {
                 log.trace("ObjectStateUtils:findMessage(): returning OUT message  ["+msgName+"]  ["+msgElementName+"] ");
             }
-            //System.out.println("ObjectStateUtils:findMessage(): returning OUT message  ["+msgName+"]  ["+msgElementName+"] ");
 
             return out;
         }
@@ -2007,7 +1939,6 @@
             {
                 log.trace("ObjectStateUtils:findMessage(): returning IN message ["+msgName+"]  ["+msgElementName+"] ");
             }
-            //System.out.println("ObjectStateUtils:findMessage(): returning IN message  ["+msgName+"]  ["+msgElementName+"] ");
 
             return in;
         }
@@ -2019,7 +1950,6 @@
         {
             log.trace("ObjectStateUtils:findMessage(): ["+msgName+"]  ["+msgElementName+"] returning  [null]");
         }
-        //System.out.println("ObjectStateUtils:findMessage(): ["+msgName+"]  ["+msgElementName+"] returning  [null]");
 
         return null;
     }
@@ -2105,7 +2035,6 @@
                     {
                         log.trace(title+" ["+handlerClassName+"]  name ["+qNameAsString+"]  returned");
                     }
-                    //System.out.println(title+" ["+handlerClassName+"]  name ["+qNameAsString+"]  returned");
 
                     return(Handler)(existingHandlers.get(i));
                 }
@@ -2117,7 +2046,6 @@
         {
             log.trace(title + " ["+handlerClassName+"]  name ["+qNameAsString+"] was not found in the existingHandlers list");
         }
-        //System.out.println(title + " ["+handlerClassName+"]  name ["+qNameAsString+"] was not found in the existingHandlers list");
         
         return null;
     }
@@ -2161,7 +2089,6 @@
                 {
                     log.trace("ObjectStateUtils:findTransportListener():  ["+listenerClassName+"]  returned");
                 }
-                //System.out.println("ObjectStateUtils:findTransportListener():  ["+listenerClassName+"]  returned");
 
                 return tl;
             }
@@ -2172,7 +2099,6 @@
         {
             log.trace("ObjectStateUtils:findTransportListener(): returning  [null]");
         }
-        //System.out.println("ObjectStateUtils:findTransportListener(): returning  [null]");
 
         return null;
     }
@@ -2205,7 +2131,6 @@
                 {
                     log.trace("ObjectStateUtils:isEquivalent(ArrayList,ArrayList): FALSE - size mismatch ["+size1+"] != ["+size2+"]");
                 }
-                //System.out.println("ObjectStateUtils:isEquivalent(ArrayList,ArrayList): FALSE - size mismatch ["+size1+"] != ["+size2+"]");
                 return false;
             }
 
@@ -2232,7 +2157,6 @@
                         {
                             log.trace("ObjectStateUtils:isEquivalent(ArrayList,ArrayList): FALSE - mismatch with element ["+obj1.getClass().getName()+"] ");
                         }
-                        //System.out.println("ObjectStateUtils:isEquivalent(ArrayList,ArrayList): FALSE - mismatch with element ["+obj1.getClass().getName()+"] ");
                         return false;
                     }
                 }
@@ -2270,7 +2194,6 @@
             {
                 log.trace("ObjectStateUtils:isEquivalent(ArrayList,ArrayList): FALSE - mismatch in lists");
             }
-            //System.out.println("ObjectStateUtils:isEquivalent(ArrayList,ArrayList): FALSE - mismatch in lists");
             return false;
         }
     }
@@ -2409,7 +2332,6 @@
 
                 // trace point
                 log.trace("ObjectStateUtils: ***NotSerializableException*** ["+nse.getMessage()+"] in method ["+methodName+"] for object ["+objName+"]  associated with ["+objDesc+"].  "+desc);
-                //System.out.println("ObjectStateUtils: ***NotSerializableException*** ["+nse.getMessage()+"] in method ["+methodName+"] for object ["+objName+"]  associated with ["+objDesc+"].  "+desc);
             }
 
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message