You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2007/03/04 19:17:07 UTC

svn commit: r514453 [4/26] - in /webservices/axis2/trunk/java/modules/kernel: src/org/apache/axis2/ src/org/apache/axis2/addressing/ src/org/apache/axis2/addressing/wsdl/ src/org/apache/axis2/builder/ src/org/apache/axis2/client/ src/org/apache/axis2/c...

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java Sun Mar  4 10:16:54 2007
@@ -216,7 +216,8 @@
      * not set, it can be assumed that the fault will be delivered via
      * Callback.onError(...).
      */
-    public static final String DISABLE_ASYNC_CALLBACK_ON_TRANSPORT_ERROR = "disableTransmissionErrorCallback";
+    public static final String DISABLE_ASYNC_CALLBACK_ON_TRANSPORT_ERROR =
+            "disableTransmissionErrorCallback";
 
     /**
      * @serial processingFault
@@ -377,7 +378,7 @@
 
 
     /*
-     * SelfManagedData will hold message-specific data set by handlers 
+     * SelfManagedData will hold message-specific data set by handlers
      * Note that this list is not explicitly saved by the MessageContext, but
      * rather through the SelfManagedDataManager interface implemented by handlers
      */
@@ -1156,7 +1157,8 @@
 
     public AxisMessage getAxisMessage() {
         if (reconcileAxisMessage) {
-            log.warn(this.getLogIDString() + ":getAxisMessage(): ****WARNING**** MessageContext.activate(configurationContext) needs to be invoked.");
+            log.warn(this.getLogIDString() +
+                    ":getAxisMessage(): ****WARNING**** MessageContext.activate(configurationContext) needs to be invoked.");
         }
 
         return axisMessage;
@@ -1176,7 +1178,7 @@
             this.axisServiceGroup = (AxisServiceGroup) this.axisService.getParent();
         } else {
             this.axisServiceGroup = null;
-    }
+        }
     }
 
     /*
@@ -1184,7 +1186,7 @@
      */
     public void setAxisServiceGroup(AxisServiceGroup axisServiceGroup) {
         // need to set the axis service group object to null when necessary
-        // for example, when extracting the message context object from 
+        // for example, when extracting the message context object from
         // the object graph
         this.axisServiceGroup = axisServiceGroup;
     }
@@ -1574,7 +1576,7 @@
     /**
      * You can directly access the attachment map of the message context from
      * here. Returned attachment map can be empty.
-     * 
+     *
      * @return attachment
      */
     public Attachments getAttachmentMap() {
@@ -1588,9 +1590,9 @@
      * Adds an attachment to the attachment Map of this message context. This
      * attachment gets serialised as a MIME attachment when sending the message
      * if SOAP with Attachments is enabled.
-     * 
-     * @param contentID :
-     *            will be the content ID of the MIME part
+     *
+     * @param contentID   :
+     *                    will be the content ID of the MIME part
      * @param dataHandler
      */
     public void addAttachment(String contentID, DataHandler dataHandler) {
@@ -1605,7 +1607,7 @@
      * attachment gets serialised as a MIME attachment when sending the message
      * if SOAP with Attachments is enabled. Content ID of the MIME part will be
      * auto generated by Axis2.
-     * 
+     *
      * @param dataHandler
      * @return the auto generated content ID of the MIME attachment
      */
@@ -1620,7 +1622,7 @@
      * content ID. Returns "NULL" if a attachment cannot be found by the given content ID.
      *
      * @param contentID :
-     *            Content ID of the MIME attachment
+     *                  Content ID of the MIME attachment
      * @return Data handler of the attachment
      */
     public DataHandler getAttachment(String contentID) {
@@ -1669,7 +1671,8 @@
      * @return A string key
      */
     private String generateSelfManagedDataKey(Class clazz, Object key) {
-        return clazz.getName() + selfManagedDataDelimiter + key.toString() + selfManagedDataDelimiter + Integer.toString(key.hashCode());
+        return clazz.getName() + selfManagedDataDelimiter + key.toString() +
+                selfManagedDataDelimiter + Integer.toString(key.hashCode());
     }
 
     /**
@@ -1716,7 +1719,7 @@
      */
     public boolean containsSelfManagedDataKey(Class clazz, Object key) {
         if (selfManagedDataMap != null) {
-            return  selfManagedDataMap.containsKey(generateSelfManagedDataKey(clazz, key));
+            return selfManagedDataMap.containsKey(generateSelfManagedDataKey(clazz, key));
         }
         return false;
     }
@@ -1772,7 +1775,8 @@
                 Object key = it2.next();
                 Handler value = (Handler) map.get(key);
                 String name = value.getName();
-                log.trace(getLogIDString() + ":flattenPhaseListToHandlers():  key [" +  key + "]    handler name [" + name + "]");
+                log.trace(getLogIDString() + ":flattenPhaseListToHandlers():  key [" + key +
+                        "]    handler name [" + name + "]");
             }
         }
 
@@ -1838,10 +1842,9 @@
                     || (selfManagedDataMap.size() == 0)
                     || (executionChain.size() == 0)) {
                 out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
-                
-                if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled())
-                {
-                  log.trace(getLogIDString() + ":serializeSelfManagedData(): No data : END");
+
+                if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
+                    log.trace(getLogIDString() + ":serializeSelfManagedData(): No data : END");
                 }
 
                 return;
@@ -1850,15 +1853,14 @@
             // let's create a temporary list with the handlers
             ArrayList flatExecChain = flattenPhaseListToHandlers(executionChain, null);
 
-            //ArrayList selfManagedDataHolderList = serializeSelfManagedDataHelper(flatExecChain.iterator(), new ArrayList()); 
+            //ArrayList selfManagedDataHolderList = serializeSelfManagedDataHelper(flatExecChain.iterator(), new ArrayList());
             ArrayList selfManagedDataHolderList = serializeSelfManagedDataHelper(flatExecChain);
 
             if (selfManagedDataHolderList.size() == 0) {
                 out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
-                
-                if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled())
-                {
-                  log.trace(getLogIDString() + ":serializeSelfManagedData(): No data : END");
+
+                if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
+                    log.trace(getLogIDString() + ":serializeSelfManagedData(): No data : END");
                 }
 
                 return;
@@ -1866,10 +1868,10 @@
 
             out.writeBoolean(ObjectStateUtils.ACTIVE_OBJECT);
 
-            // SelfManagedData can be binary so won't be able to treat it as a 
+            // SelfManagedData can be binary so won't be able to treat it as a
             // string - need to treat it as a byte []
 
-            // how many handlers actually 
+            // how many handlers actually
             // returned serialized SelfManagedData
             out.writeInt(selfManagedDataHolderList.size());
 
@@ -1879,7 +1881,8 @@
 
         }
         catch (IOException e) {
-            log.trace("MessageContext:serializeSelfManagedData(): Exception [" + e.getClass().getName() + "]  description [" + e.getMessage() + "]", e);
+            log.trace("MessageContext:serializeSelfManagedData(): Exception [" +
+                    e.getClass().getName() + "]  description [" + e.getMessage() + "]", e);
         }
 
     }
@@ -1908,21 +1911,31 @@
                     // only call the handler's serializeSelfManagedData if it implements SelfManagedDataManager
 
                     if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-                      log.trace("MessageContext:serializeSelfManagedDataHelper(): calling handler  [" + handler.getClass().getName() + "]  name [" + handler.getName() + "]   serializeSelfManagedData method");
+                        log.trace(
+                                "MessageContext:serializeSelfManagedDataHelper(): calling handler  [" +
+                                        handler.getClass().getName() + "]  name [" +
+                                        handler.getName() + "]   serializeSelfManagedData method");
                     }
 
-                    ByteArrayOutputStream baos_fromHandler = ((SelfManagedDataManager) handler).serializeSelfManagedData(this);
+                    ByteArrayOutputStream baos_fromHandler =
+                            ((SelfManagedDataManager) handler).serializeSelfManagedData(this);
 
                     if (baos_fromHandler != null) {
                         baos_fromHandler.close();
 
                         try {
-                            SelfManagedDataHolder selfManagedDataHolder = new SelfManagedDataHolder(handler.getClass().getName(), handler.getName(), baos_fromHandler.toByteArray());
+                            SelfManagedDataHolder selfManagedDataHolder = new SelfManagedDataHolder(
+                                    handler.getClass().getName(), handler.getName(),
+                                    baos_fromHandler.toByteArray());
                             selfManagedDataHolderList.add(selfManagedDataHolder);
                             selfManagedDataHandlerCount++;
                         }
                         catch (Exception exc) {
-                            log.trace("MessageContext:serializeSelfManagedData(): exception [" + exc.getClass().getName() + "][" + exc.getMessage() + "]  in setting up SelfManagedDataHolder object for [" + handler.getClass().getName() + " / " + handler.getName() + "] ", exc);
+                            log.trace("MessageContext:serializeSelfManagedData(): exception [" +
+                                    exc.getClass().getName() + "][" + exc.getMessage() +
+                                    "]  in setting up SelfManagedDataHolder object for [" +
+                                    handler.getClass().getName() + " / " + handler.getName() + "] ",
+                                      exc);
                         }
                     }
                 }
@@ -1931,7 +1944,8 @@
             return selfManagedDataHolderList;
         }
         catch (Exception ex) {
-            log.trace("MessageContext:serializeSelfManagedData(): exception [" + ex.getClass().getName() + "][" + ex.getMessage() + "]", ex);
+            log.trace("MessageContext:serializeSelfManagedData(): exception [" +
+                    ex.getClass().getName() + "][" + ex.getMessage() + "]", ex);
             return null;
         }
 
@@ -1950,7 +1964,9 @@
      * @param qNameAsString The QName in string form
      * @return SelfManagedDataManager handler
      */
-    private SelfManagedDataManager deserialize_getHandlerFromExecutionChain(Iterator it, String classname, String qNameAsString) {
+    private SelfManagedDataManager deserialize_getHandlerFromExecutionChain(Iterator it,
+                                                                            String classname,
+                                                                            String qNameAsString) {
         SelfManagedDataManager handler_toreturn = null;
 
         try {
@@ -1958,7 +1974,8 @@
                 Handler handler = (Handler) it.next();
 
                 if (handler instanceof Phase) {
-                    handler_toreturn = deserialize_getHandlerFromExecutionChain(((Phase) handler).getHandlers().iterator(), classname, qNameAsString);
+                    handler_toreturn = deserialize_getHandlerFromExecutionChain(
+                            ((Phase) handler).getHandlers().iterator(), classname, qNameAsString);
                 } else if ((handler.getClass().getName().equals(classname))
                         && (handler.getName().equals(qNameAsString))) {
                     handler_toreturn = (SelfManagedDataManager) handler;
@@ -1973,7 +1990,9 @@
             // implementation than the one we saved during serializeSelfManagedData.
             // NOTE: the exception gets absorbed!
 
-            log.trace("MessageContext:deserialize_getHandlerFromExecutionChain(): ClassCastException thrown: " + e.getMessage(), e);
+            log.trace(
+                    "MessageContext:deserialize_getHandlerFromExecutionChain(): ClassCastException thrown: " +
+                            e.getMessage(), e);
             return null;
         }
     }
@@ -1987,29 +2006,39 @@
     */
     private void deserializeSelfManagedData() throws IOException {
         try {
-            for (int i = 0; (selfManagedDataListHolder != null) && (i < selfManagedDataListHolder.size()); i++) {
-                SelfManagedDataHolder selfManagedDataHolder = (SelfManagedDataHolder) selfManagedDataListHolder.get(i);
+            for (int i = 0;
+                 (selfManagedDataListHolder != null) && (i < selfManagedDataListHolder.size()); i++)
+            {
+                SelfManagedDataHolder selfManagedDataHolder =
+                        (SelfManagedDataHolder) selfManagedDataListHolder.get(i);
 
                 String classname = selfManagedDataHolder.getClassname();
                 String qNameAsString = selfManagedDataHolder.getId();
 
-                SelfManagedDataManager handler = deserialize_getHandlerFromExecutionChain(executionChain.iterator(), classname, qNameAsString);
+                SelfManagedDataManager handler = deserialize_getHandlerFromExecutionChain(
+                        executionChain.iterator(), classname, qNameAsString);
 
                 if (handler == null) {
                     if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-                      log.trace(getLogIDString() + ":deserializeSelfManagedData():  [" + classname + "]  was not found in the executionChain associated with the message context.");
+                        log.trace(getLogIDString() + ":deserializeSelfManagedData():  [" +
+                                classname +
+                                "]  was not found in the executionChain associated with the message context.");
                     }
-                    
-                    throw new IOException("The class [" + classname + "] was not found in the executionChain associated with the message context.");
+
+                    throw new IOException("The class [" + classname +
+                            "] was not found in the executionChain associated with the message context.");
                 }
 
-                ByteArrayInputStream handlerData = new ByteArrayInputStream(selfManagedDataHolder.getData());
+                ByteArrayInputStream handlerData =
+                        new ByteArrayInputStream(selfManagedDataHolder.getData());
 
                 // the handler implementing SelfManagedDataManager is responsible for repopulating
                 // the SelfManagedData in the MessageContext (this)
-                
+
                 if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-                  log.trace(getLogIDString() + ":deserializeSelfManagedData(): calling handler [" + classname + "] [" + qNameAsString + "]  deserializeSelfManagedData method");
+                    log.trace(getLogIDString() +
+                            ":deserializeSelfManagedData(): calling handler [" + classname + "] [" +
+                            qNameAsString + "]  deserializeSelfManagedData method");
                 }
 
                 handler.deserializeSelfManagedData(handlerData, this);
@@ -2018,7 +2047,8 @@
         }
         catch (IOException ioe) {
             if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-              log.trace(getLogIDString() + ":deserializeSelfManagedData(): IOException thrown: " + ioe.getMessage(), ioe);
+                log.trace(getLogIDString() + ":deserializeSelfManagedData(): IOException thrown: " +
+                        ioe.getMessage(), ioe);
             }
             throw ioe;
         }
@@ -2047,12 +2077,12 @@
         String logCorrelationIDString = getLogIDString();
 
         if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-          log.trace(logCorrelationIDString + ":writeExternal(): writing to output stream");
+            log.trace(logCorrelationIDString + ":writeExternal(): writing to output stream");
         }
 
         //---------------------------------------------------------
-        // in order to handle future changes to the message 
-        // context definition, be sure to maintain the 
+        // in order to handle future changes to the message
+        // context definition, be sure to maintain the
         // object level identifiers
         //---------------------------------------------------------
         // serialization version ID
@@ -2127,12 +2157,15 @@
                 msgBuffer.write(msgData.toByteArray(), 0, msgData.size());
 
                 if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-                  log.trace(logCorrelationIDString + ":writeExternal(): msg data [" + msgData + "]");
+                    log.trace(logCorrelationIDString + ":writeExternal(): msg data [" + msgData +
+                            "]");
                 }
 
             }
             catch (Exception e) {
-                log.trace(logCorrelationIDString + ":writeExternal(): can not serialize the SOAP message ***Exception***  [" + e.getClass().getName() + " : " + e.getMessage() + "]");
+                log.trace(logCorrelationIDString +
+                        ":writeExternal(): can not serialize the SOAP message ***Exception***  [" +
+                        e.getClass().getName() + " : " + e.getMessage() + "]");
             }
 
             //---------------------------------------------
@@ -2143,7 +2176,8 @@
             if (charSetEnc == null) {
                 OperationContext opContext = getOperationContext();
                 if (opContext != null) {
-                    charSetEnc = (String) opContext.getProperty(MessageContext.CHARACTER_SET_ENCODING);
+                    charSetEnc =
+                            (String) opContext.getProperty(MessageContext.CHARACTER_SET_ENCODING);
                 }
             }
 
@@ -2160,7 +2194,7 @@
             //           the class name
             //           the active or empty flag
             //           the data length
-            //           the data   
+            //           the data
             out.writeUTF(msgClass);
 
             int msgSize = msgBuffer.size();
@@ -2173,14 +2207,16 @@
                 out.write(msgBuffer.toByteArray());
 
                 if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-                  log.trace(logCorrelationIDString + ":writeExternal(): msg  charSetEnc=[" + charSetEnc + "]  namespaceURI=[" + namespaceURI + "]  msgSize=[" + msgSize + "]");
+                    log.trace(logCorrelationIDString + ":writeExternal(): msg  charSetEnc=[" +
+                            charSetEnc + "]  namespaceURI=[" + namespaceURI + "]  msgSize=[" +
+                            msgSize + "]");
                 }
             } else {
                 // the envelope is null
                 out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
 
                 if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-                  log.trace(logCorrelationIDString + ":writeExternal(): msg  is Empty");
+                    log.trace(logCorrelationIDString + ":writeExternal(): msg  is Empty");
                 }
             }
 
@@ -2192,20 +2228,20 @@
             out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
 
             if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-              log.trace(logCorrelationIDString + ":writeExternal(): msg  is Empty");
+                log.trace(logCorrelationIDString + ":writeExternal(): msg  is Empty");
             }
         }
 
         //---------------------------------------------------------
-        // ArrayList executionChain 
-        //     handler and phase related data 
+        // ArrayList executionChain
+        //     handler and phase related data
         //---------------------------------------------------------
         // The strategy is to save some metadata about each
         // member of the list and the order of the list.
         // Then when the message context is re-constituted,
-        // try to match up with phases and handlers on the 
+        // try to match up with phases and handlers on the
         // engine.
-        //    
+        //
         // Non-null list:
         //    UTF          - description string
         //    boolean      - active flag
@@ -2217,7 +2253,7 @@
         //                        with MetaDataEntry.LAST_ENTRY marker
         //    int          - adjusted number of entries in the list
         //                        includes the last empty entry
-        //    
+        //
         // Empty list:
         //    UTF          - description string
         //    boolean      - empty flag
@@ -2253,7 +2289,7 @@
                 mdEntry.setClassName(objClass);
 
                 // get the correct object-specific name
-                String qnameAsString ;
+                String qnameAsString;
 
                 if (obj instanceof Phase) {
                     Phase phaseObj = (Phase) obj;
@@ -2274,18 +2310,24 @@
                 // update the index for the entry in the chain
 
                 if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-                  log.trace(logCorrelationIDString + ":writeExternal(): ***BEFORE OBJ WRITE*** executionChain entry class [" + objClass + "] qname [" + qnameAsString + "]");
+                    log.trace(logCorrelationIDString +
+                            ":writeExternal(): ***BEFORE OBJ WRITE*** executionChain entry class [" +
+                            objClass + "] qname [" + qnameAsString + "]");
                 }
 
-                ObjectStateUtils.writeObject(out, mdEntry, logCorrelationIDString + ".executionChain:entry class [" + objClass + "] qname [" + qnameAsString + "]");
+                ObjectStateUtils.writeObject(out, mdEntry, logCorrelationIDString +
+                        ".executionChain:entry class [" + objClass + "] qname [" + qnameAsString +
+                        "]");
 
-                // update the index so that the index 
+                // update the index so that the index
                 // now indicates the next entry that
                 // will be attempted
                 nextIndex++;
 
                 if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-                  log.trace(logCorrelationIDString + ":writeExternal(): ***AFTER OBJ WRITE*** executionChain entry class [" + objClass + "] qname [" + qnameAsString + "]");
+                    log.trace(logCorrelationIDString +
+                            ":writeExternal(): ***AFTER OBJ WRITE*** executionChain entry class [" +
+                            objClass + "] qname [" + qnameAsString + "]");
                 }
 
             } // end while entries in execution chain
@@ -2295,11 +2337,12 @@
             MetaDataEntry lastEntry = new MetaDataEntry();
             lastEntry.setClassName(MetaDataEntry.END_OF_LIST);
 
-            ObjectStateUtils.writeObject(out, lastEntry, logCorrelationIDString + ".executionChain:  last entry ");
+            ObjectStateUtils.writeObject(out, lastEntry,
+                                         logCorrelationIDString + ".executionChain:  last entry ");
             nextIndex++;
 
-            // nextIndex also gives us the number of entries 
-            // that were actually saved as opposed to the 
+            // nextIndex also gives us the number of entries
+            // that were actually saved as opposed to the
             // number of entries in the executionChain
             out.writeInt(nextIndex);
 
@@ -2310,19 +2353,19 @@
             out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
 
             if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-              log.trace(logCorrelationIDString + ":writeExternal(): executionChain is NULL");
+                log.trace(logCorrelationIDString + ":writeExternal(): executionChain is NULL");
             }
         }
 
         //---------------------------------------------------------
-        // LinkedList inboundExecutedPhases 
+        // LinkedList inboundExecutedPhases
         //---------------------------------------------------------
         // The strategy is to save some metadata about each
         // member of the list and the order of the list.
         // Then when the message context is re-constituted,
-        // try to match up with phases and handlers on the 
+        // try to match up with phases and handlers on the
         // engine.
-        //    
+        //
         // Non-null list:
         //    UTF          - description string
         //    boolean      - active flag
@@ -2332,7 +2375,7 @@
         //                        with MetaDataEntry.LAST_ENTRY marker
         //    int          - adjusted number of entries in the list
         //                        includes the last empty entry
-        //    
+        //
         // Empty list:
         //    UTF          - description string
         //    boolean      - empty flag
@@ -2365,7 +2408,7 @@
                 inMdEntry.setClassName(inObjClass);
 
                 // get the correct object-specific name
-                String inQnameAsString ;
+                String inQnameAsString;
 
                 if (inObj instanceof Phase) {
                     Phase inPhaseObj = (Phase) inObj;
@@ -2385,21 +2428,25 @@
 
 
                 if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-                  log.trace(logCorrelationIDString + ":writeExternal(): ***BEFORE Inbound Executed List OBJ WRITE*** inboundExecutedPhases entry class [" + inObjClass + "] qname [" + inQnameAsString + "]");
+                    log.trace(logCorrelationIDString +
+                            ":writeExternal(): ***BEFORE Inbound Executed List OBJ WRITE*** inboundExecutedPhases entry class [" +
+                            inObjClass + "] qname [" + inQnameAsString + "]");
                 }
 
-                ObjectStateUtils.writeObject(out, inMdEntry, logCorrelationIDString + ".inboundExecutedPhases:entry class [" + inObjClass + "] qname [" + inQnameAsString + "]");
+                ObjectStateUtils.writeObject(out, inMdEntry, logCorrelationIDString +
+                        ".inboundExecutedPhases:entry class [" + inObjClass + "] qname [" +
+                        inQnameAsString + "]");
 
-                // update the index so that the index 
+                // update the index so that the index
                 // now indicates the next entry that
                 // will be attempted
                 inExecNextIndex++;
 
                 if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-                  log.trace(logCorrelationIDString + ":writeExternal(): " +
-                        "***AFTER Inbound Executed List OBJ WRITE*** " +
-                        "inboundExecutedPhases entry class [" + inObjClass + "] " +
-                        "qname [" + inQnameAsString + "]");
+                    log.trace(logCorrelationIDString + ":writeExternal(): " +
+                            "***AFTER Inbound Executed List OBJ WRITE*** " +
+                            "inboundExecutedPhases entry class [" + inObjClass + "] " +
+                            "qname [" + inQnameAsString + "]");
                 }
             } // end while entries in execution chain
 
@@ -2408,11 +2455,12 @@
             MetaDataEntry inLastEntry = new MetaDataEntry();
             inLastEntry.setClassName(MetaDataEntry.END_OF_LIST);
 
-            ObjectStateUtils.writeObject(out, inLastEntry, logCorrelationIDString + ".inboundExecutedPhases:  last entry ");
+            ObjectStateUtils.writeObject(out, inLastEntry, logCorrelationIDString +
+                    ".inboundExecutedPhases:  last entry ");
             inExecNextIndex++;
 
-            // inExecNextIndex also gives us the number of entries 
-            // that were actually saved as opposed to the 
+            // inExecNextIndex also gives us the number of entries
+            // that were actually saved as opposed to the
             // number of entries in the inboundExecutedPhases
             out.writeInt(inExecNextIndex);
 
@@ -2423,19 +2471,20 @@
             out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
 
             if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-              log.trace(logCorrelationIDString + ":writeExternal(): inboundExecutedPhases is NULL");
+                log.trace(
+                        logCorrelationIDString + ":writeExternal(): inboundExecutedPhases is NULL");
             }
         }
 
         //---------------------------------------------------------
-        // LinkedList outboundExecutedPhases 
+        // LinkedList outboundExecutedPhases
         //---------------------------------------------------------
         // The strategy is to save some metadata about each
         // member of the list and the order of the list.
         // Then when the message context is re-constituted,
-        // try to match up with phases and handlers on the 
+        // try to match up with phases and handlers on the
         // engine.
-        //    
+        //
         // Non-null list:
         //    UTF          - description string
         //    boolean      - active flag
@@ -2445,7 +2494,7 @@
         //                        with MetaDataEntry.LAST_ENTRY marker
         //    int          - adjusted number of entries in the list
         //                        includes the last empty entry
-        //    
+        //
         // Empty list:
         //    UTF          - description string
         //    boolean      - empty flag
@@ -2497,32 +2546,39 @@
                 outMdEntry.setQName(outQnameAsString);
 
                 if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-                  log.trace(logCorrelationIDString + ":writeExternal(): ***BEFORE Outbound Executed List OBJ WRITE*** outboundExecutedPhases entry class [" + outObjClass + "] qname [" + outQnameAsString + "]");
+                    log.trace(logCorrelationIDString +
+                            ":writeExternal(): ***BEFORE Outbound Executed List OBJ WRITE*** outboundExecutedPhases entry class [" +
+                            outObjClass + "] qname [" + outQnameAsString + "]");
                 }
 
-                ObjectStateUtils.writeObject(out, outMdEntry, logCorrelationIDString + ".outboundExecutedPhases:entry class [" + outObjClass + "] qname [" + outQnameAsString + "]");
+                ObjectStateUtils.writeObject(out, outMdEntry, logCorrelationIDString +
+                        ".outboundExecutedPhases:entry class [" + outObjClass + "] qname [" +
+                        outQnameAsString + "]");
 
-                // update the index so that the index 
+                // update the index so that the index
                 // now indicates the next entry that
                 // will be attempted
                 outExecNextIndex++;
 
                 if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-                  log.trace(logCorrelationIDString + ":writeExternal(): ***AFTER Outbound Executed List OBJ WRITE*** outboundExecutedPhases entry class [" + outObjClass + "] qname [" + outQnameAsString + "]");
+                    log.trace(logCorrelationIDString +
+                            ":writeExternal(): ***AFTER Outbound Executed List OBJ WRITE*** outboundExecutedPhases entry class [" +
+                            outObjClass + "] qname [" + outQnameAsString + "]");
                 }
 
-            } // end while entries 
+            } // end while entries
 
-            // done with the entries 
+            // done with the entries
             // add the end-of-list marker
             MetaDataEntry outLastEntry = new MetaDataEntry();
             outLastEntry.setClassName(MetaDataEntry.END_OF_LIST);
 
-            ObjectStateUtils.writeObject(out, outLastEntry, logCorrelationIDString + ".outboundExecutedPhases:  last entry ");
+            ObjectStateUtils.writeObject(out, outLastEntry, logCorrelationIDString +
+                    ".outboundExecutedPhases:  last entry ");
             outExecNextIndex++;
 
-            // outExecNextIndex also gives us the number of entries 
-            // that were actually saved as opposed to the 
+            // outExecNextIndex also gives us the number of entries
+            // that were actually saved as opposed to the
             // number of entries in the outboundExecutedPhases
             out.writeInt(outExecNextIndex);
 
@@ -2533,7 +2589,8 @@
             out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
 
             if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-              log.trace(logCorrelationIDString + ":writeExternal(): outboundExecutedPhases is NULL");
+                log.trace(logCorrelationIDString +
+                        ":writeExternal(): outboundExecutedPhases is NULL");
             }
         }
 
@@ -2552,12 +2609,13 @@
             log.info(logCorrelationIDString + ":writeExternal():   message ID [" + tmpID + "]");
         }
 
-        ObjectStateUtils.writeObject(out, options, logCorrelationIDString + ".options   for  [" + options.getLogCorrelationIDString() + "]");
+        ObjectStateUtils.writeObject(out, options, logCorrelationIDString + ".options   for  [" +
+                options.getLogCorrelationIDString() + "]");
 
         //---------------------------------------------------------
         // operation
         //---------------------------------------------------------
-        // axis operation 
+        // axis operation
         //---------------------------------------------------------
         String axisOpMarker = logCorrelationIDString + ".axisOperation";
         ObjectStateUtils.writeString(out, axisOpMarker, axisOpMarker);
@@ -2565,7 +2623,7 @@
         if (axisOperation == null) {
             out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
         } else {
-            // TODO: may need to include the meta data for the axis service that is 
+            // TODO: may need to include the meta data for the axis service that is
             //       the parent of the axis operation
 
             out.writeBoolean(ObjectStateUtils.ACTIVE_OBJECT);
@@ -2578,8 +2636,10 @@
                 axisOperation.setName(aoTmpQName);
             }
 
-            metaAxisOperation = new MetaDataEntry(axisOperation.getClass().getName(), axisOperation.getName().toString());
-            ObjectStateUtils.writeObject(out, metaAxisOperation, logCorrelationIDString + ".metaAxisOperation");
+            metaAxisOperation = new MetaDataEntry(axisOperation.getClass().getName(),
+                                                  axisOperation.getName().toString());
+            ObjectStateUtils.writeObject(out, metaAxisOperation,
+                                         logCorrelationIDString + ".metaAxisOperation");
         }
 
         //---------------------------------------------------------
@@ -2611,14 +2671,17 @@
             out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
         } else {
             out.writeBoolean(ObjectStateUtils.ACTIVE_OBJECT);
-            metaAxisService = new MetaDataEntry(axisService.getClass().getName(), axisService.getName());
-            ObjectStateUtils.writeObject(out, metaAxisService, logCorrelationIDString + ".metaAxisService");
+            metaAxisService =
+                    new MetaDataEntry(axisService.getClass().getName(), axisService.getName());
+            ObjectStateUtils
+                    .writeObject(out, metaAxisService, logCorrelationIDString + ".metaAxisService");
         }
 
         //-------------------------
         // serviceContextID string
         //-------------------------
-        ObjectStateUtils.writeString(out, serviceContextID, logCorrelationIDString + ".serviceContextID");
+        ObjectStateUtils
+                .writeString(out, serviceContextID, logCorrelationIDString + ".serviceContextID");
 
         //-------------------------
         // serviceContext
@@ -2648,7 +2711,8 @@
 
             // only write out the object if it is not the parent
             if (!isParent) {
-                ObjectStateUtils.writeObject(out, serviceContext, logCorrelationIDString + ".serviceContext");
+                ObjectStateUtils.writeObject(out, serviceContext,
+                                             logCorrelationIDString + ".serviceContext");
             }
         }
 
@@ -2663,14 +2727,17 @@
             out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
         } else {
             out.writeBoolean(ObjectStateUtils.ACTIVE_OBJECT);
-            metaAxisServiceGroup = new MetaDataEntry(axisServiceGroup.getClass().getName(), axisServiceGroup.getServiceGroupName());
-            ObjectStateUtils.writeObject(out, metaAxisServiceGroup, logCorrelationIDString + ".metaAxisServiceGroup");
+            metaAxisServiceGroup = new MetaDataEntry(axisServiceGroup.getClass().getName(),
+                                                     axisServiceGroup.getServiceGroupName());
+            ObjectStateUtils.writeObject(out, metaAxisServiceGroup,
+                                         logCorrelationIDString + ".metaAxisServiceGroup");
         }
 
         //-----------------------------
         // serviceGroupContextId string
         //-----------------------------
-        ObjectStateUtils.writeString(out, serviceGroupContextId, logCorrelationIDString + ".serviceGroupContextId");
+        ObjectStateUtils.writeString(out, serviceGroupContextId,
+                                     logCorrelationIDString + ".serviceGroupContextId");
 
         //-------------------------
         // serviceGroupContext
@@ -2701,7 +2768,8 @@
 
             // only write out the object if it is not the parent
             if (!isParent) {
-                ObjectStateUtils.writeObject(out, serviceGroupContext, logCorrelationIDString + ".serviceGroupContext");
+                ObjectStateUtils.writeObject(out, serviceGroupContext,
+                                             logCorrelationIDString + ".serviceGroupContext");
             }
         }
 
@@ -2717,7 +2785,7 @@
             // This AxisMessage is expected to belong to the AxisOperation
             // that has already been recorded for this MessageContext.
             // If an AxisMessage associated with this Messagecontext is
-            // associated with a different AxisOperation, then more 
+            // associated with a different AxisOperation, then more
             // meta information would need to be saved
 
             out.writeBoolean(ObjectStateUtils.ACTIVE_OBJECT);
@@ -2738,16 +2806,18 @@
                 amTmpElemQNameString = amTmpElementQName.toString();
             }
 
-            metaAxisMessage = new MetaDataEntry(axisMessage.getClass().getName(), axisMessage.getName(), amTmpElemQNameString);
+            metaAxisMessage = new MetaDataEntry(axisMessage.getClass().getName(),
+                                                axisMessage.getName(), amTmpElemQNameString);
 
-            ObjectStateUtils.writeObject(out, metaAxisMessage, logCorrelationIDString + ".metaAxisMessage");
+            ObjectStateUtils
+                    .writeObject(out, metaAxisMessage, logCorrelationIDString + ".metaAxisMessage");
         }
 
         //---------------------------------------------------------
         // configuration context
         //---------------------------------------------------------
 
-        // NOTE: Currently, there does not seem to be any 
+        // NOTE: Currently, there does not seem to be any
         //       runtime data important to this message context
         //       in the configuration context.
         //       if so, then need to save that runtime data and reconcile
@@ -2757,7 +2827,8 @@
         //---------------------------------------------------------
         // session context
         //---------------------------------------------------------
-        ObjectStateUtils.writeObject(out, sessionContext, logCorrelationIDString + ".sessionContext");
+        ObjectStateUtils
+                .writeObject(out, sessionContext, logCorrelationIDString + ".sessionContext");
 
         //---------------------------------------------------------
         // transport
@@ -2766,7 +2837,8 @@
         //------------------------------
         // incomingTransportName string
         //------------------------------
-        ObjectStateUtils.writeString(out, incomingTransportName, logCorrelationIDString + ".incomingTransportName");
+        ObjectStateUtils.writeString(out, incomingTransportName,
+                                     logCorrelationIDString + ".incomingTransportName");
 
         // TransportInDescription transportIn
         if (transportIn != null) {
@@ -2782,7 +2854,8 @@
         } else {
             metaTransportOut = null;
         }
-        ObjectStateUtils.writeObject(out, metaTransportOut, logCorrelationIDString + ".transportOut");
+        ObjectStateUtils
+                .writeObject(out, metaTransportOut, logCorrelationIDString + ".transportOut");
 
         //---------------------------------------------------------
         // properties
@@ -2813,7 +2886,9 @@
         //---------------------------------------------------------
 
         if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-          log.trace(logCorrelationIDString + ":writeExternal(): completed writing to output stream for " + logCorrelationIDString);
+            log.trace(logCorrelationIDString +
+                    ":writeExternal(): completed writing to output stream for " +
+                    logCorrelationIDString);
         }
 
     }
@@ -2833,13 +2908,14 @@
      */
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         // set the flag to indicate that the message context is being
-        // reconstituted and will need to have certain object references 
+        // reconstituted and will need to have certain object references
         // to be reconciled with the current engine setup
         needsToBeReconciled = true;
 
         // trace point
         if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-          log.trace(myClassName + ":readExternal():  BEGIN  bytes available in stream [" + in.available() + "]  ");
+            log.trace(myClassName + ":readExternal():  BEGIN  bytes available in stream [" +
+                    in.available() + "]  ");
         }
 
         //---------------------------------------------------------
@@ -2889,7 +2965,8 @@
 
         // trace point
         if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-          log.trace(myClassName + ":readExternal():  reading the input stream for  " + logCorrelationIDString);
+            log.trace(myClassName + ":readExternal():  reading the input stream for  " +
+                    logCorrelationIDString);
         }
 
         boolean persistedWithOptimizedMTOM = in.readBoolean();
@@ -2914,7 +2991,7 @@
             byte[] buffer = new byte[msgSize];
 
             int bytesRead = 0;
-            int numberOfBytesLastRead ;
+            int numberOfBytesLastRead;
 
             while (bytesRead < msgSize) {
                 numberOfBytesLastRead = in.read(buffer, bytesRead, msgSize - bytesRead);
@@ -2922,9 +2999,11 @@
                 if (numberOfBytesLastRead == -1) {
                     // TODO: What should we do if the reconstitution fails?
                     // For now, log the event
-                  if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-                    log.trace(logCorrelationIDString + ":readExternal(): ***WARNING*** unexpected end to message   bytesRead [" + bytesRead + "]    msgSize [" + msgSize + "]");
-                  }
+                    if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
+                        log.trace(logCorrelationIDString +
+                                ":readExternal(): ***WARNING*** unexpected end to message   bytesRead [" +
+                                bytesRead + "]    msgSize [" + msgSize + "]");
+                    }
                     break;
                 }
 
@@ -2935,23 +3014,26 @@
             String tmpMsg = new String(buffer);
 
             if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-              log.trace(logCorrelationIDString + ":readExternal(): msg  charSetEnc=[" + charSetEnc + "]  namespaceURI=[" + namespaceURI + "]  msgSize=[" + msgSize + "]   bytesRead [" + bytesRead + "]");
-              log.trace(logCorrelationIDString + ":readExternal(): msg  [" + tmpMsg + "]");
+                log.trace(logCorrelationIDString + ":readExternal(): msg  charSetEnc=[" +
+                        charSetEnc + "]  namespaceURI=[" + namespaceURI + "]  msgSize=[" + msgSize +
+                        "]   bytesRead [" + bytesRead + "]");
+                log.trace(logCorrelationIDString + ":readExternal(): msg  [" + tmpMsg + "]");
             }
-            
-            ByteArrayInputStream msgBuffer ;
+
+            ByteArrayInputStream msgBuffer;
 
             if (bytesRead > 0) {
                 msgBuffer = new ByteArrayInputStream(buffer);
 
                 // convert what was saved into the soap envelope
 
-                XMLStreamReader xmlreader ;
+                XMLStreamReader xmlreader;
 
                 try {
                     if (persistedWithOptimizedMTOM) {
                         boolean isSOAP = true;
-                        StAXBuilder builder = BuilderUtil.getAttachmentsBuilder(this, msgBuffer, contentType, isSOAP);
+                        StAXBuilder builder = BuilderUtil
+                                .getAttachmentsBuilder(this, msgBuffer, contentType, isSOAP);
                         envelope = (SOAPEnvelope) builder.getDocumentElement();
                     } else {
                         xmlreader = StAXUtils.createXMLStreamReader(msgBuffer, charSetEnc);
@@ -2962,7 +3044,9 @@
                 catch (Exception ex) {
                     // TODO: what to do if can't get the XML stream reader
                     // For now, log the event
-                    log.error(logCorrelationIDString + ":readExternal(): Error when deserializing persisted envelope: [" + ex.getClass().getName() + " : " + ex.getLocalizedMessage() + "]", ex);
+                    log.error(logCorrelationIDString +
+                            ":readExternal(): Error when deserializing persisted envelope: [" +
+                            ex.getClass().getName() + " : " + ex.getLocalizedMessage() + "]", ex);
                     envelope = null;
                 }
 
@@ -2972,7 +3056,8 @@
                 envelope = null;
 
                 if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-                  log.trace(logCorrelationIDString + ":readExternal(): no message from the input stream");
+                    log.trace(logCorrelationIDString +
+                            ":readExternal(): no message from the input stream");
                 }
             }
 
@@ -2981,19 +3066,19 @@
             envelope = null;
 
             if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-              log.trace(logCorrelationIDString + ":readExternal(): no message present");
+                log.trace(logCorrelationIDString + ":readExternal(): no message present");
             }
         }
 
         //---------------------------------------------------------
-        // ArrayList executionChain 
-        //     handler and phase related data 
+        // ArrayList executionChain
+        //     handler and phase related data
         //---------------------------------------------------------
         // Restore the metadata about each member of the list
         // and the order of the list.
         // This metadata will be used to match up with phases
         // and handlers on the engine.
-        //    
+        //
         // Non-null list:
         //    UTF          - description string
         //    boolean      - active flag
@@ -3006,20 +3091,20 @@
         //                        with MetaDataEntry.LAST_ENTRY marker
         //    int          - adjusted number of entries in the list
         //                        includes the last empty entry
-        //    
+        //
         // Empty list:
         //    UTF          - description string
         //    boolean      - empty flag
         //---------------------------------------------------------
 
-        // the local chain is not enabled until the 
+        // the local chain is not enabled until the
         // list has been reconstituted
         executionChain = null;
         currentHandlerIndex = -1;
         currentPhaseIndex = 0;
         metaExecutionChain = null;
 
-         in.readUTF();
+        in.readUTF();
         boolean gotChain = in.readBoolean();
 
         if (gotChain == ObjectStateUtils.ACTIVE_OBJECT) {
@@ -3029,7 +3114,9 @@
             int expectedNumberEntries = in.readInt();
 
             if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-              log.trace(logCorrelationIDString + ":readExternal(): execution chain:  expected number of entries [" + expectedNumberEntries + "]");
+                log.trace(logCorrelationIDString +
+                        ":readExternal(): execution chain:  expected number of entries [" +
+                        expectedNumberEntries + "]");
             }
 
             // setup the list
@@ -3043,15 +3130,16 @@
                 // stop when we get to the end-of-list marker
 
                 // get the object
-                Object tmpObj = ObjectStateUtils.readObject(in, "MessageContext.metaExecutionChain MetaDataEntry");
+                Object tmpObj = ObjectStateUtils
+                        .readObject(in, "MessageContext.metaExecutionChain MetaDataEntry");
 
                 count++;
 
                 MetaDataEntry mdObj = (MetaDataEntry) tmpObj;
 
                 // get the class name, then add it to the list
-                String tmpClassNameStr ;
-                String tmpQNameAsStr ;
+                String tmpClassNameStr;
+                String tmpQNameAsStr;
                 String tmpHasList = "no list";
 
                 if (mdObj != null) {
@@ -3071,7 +3159,10 @@
                         }
 
                         if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-                          log.trace(logCorrelationIDString + ":readExternal(): meta data class [" + tmpClassNameStr + "] qname [" + tmpQNameAsStr + "]  index [" + count + "]   [" + tmpHasList + "]");
+                            log.trace(logCorrelationIDString +
+                                    ":readExternal(): meta data class [" + tmpClassNameStr +
+                                    "] qname [" + tmpQNameAsStr + "]  index [" + count + "]   [" +
+                                    tmpHasList + "]");
                         }
                     }
                 } else {
@@ -3084,14 +3175,17 @@
             int adjustedNumberEntries = in.readInt();
 
             if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-              log.trace(logCorrelationIDString + ":readExternal(): adjusted number of entries ExecutionChain [" + adjustedNumberEntries + "]    ");
+                log.trace(logCorrelationIDString +
+                        ":readExternal(): adjusted number of entries ExecutionChain [" +
+                        adjustedNumberEntries + "]    ");
             }
         }
 
         if ((metaExecutionChain == null) || (metaExecutionChain.isEmpty())) {
-          if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-            log.trace(logCorrelationIDString + ":readExternal(): meta data for Execution Chain is NULL");
-          }
+            if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
+                log.trace(logCorrelationIDString +
+                        ":readExternal(): meta data for Execution Chain is NULL");
+            }
         }
 
         //---------------------------------------------------------
@@ -3101,7 +3195,7 @@
         // and the order of the list.
         // This metadata will be used to match up with phases
         // and handlers on the engine.
-        //    
+        //
         // Non-null list:
         //    UTF          - description string
         //    boolean      - active flag
@@ -3112,13 +3206,13 @@
         //                        with MetaDataEntry.LAST_ENTRY marker
         //    int          - adjusted number of entries in the list
         //                        includes the last empty entry
-        //    
+        //
         // Empty list:
         //    UTF          - description string
         //    boolean      - empty flag
         //---------------------------------------------------------
 
-        // the local chain is not enabled until the 
+        // the local chain is not enabled until the
         // list has been reconstituted
         inboundExecutedPhases = null;
         metaInboundExecuted = null;
@@ -3130,7 +3224,9 @@
             int expectedNumberInExecList = in.readInt();
 
             if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-              log.trace(logCorrelationIDString + ":readExternal(): inbound executed phases:  expected number of entries [" + expectedNumberInExecList + "]");
+                log.trace(logCorrelationIDString +
+                        ":readExternal(): inbound executed phases:  expected number of entries [" +
+                        expectedNumberInExecList + "]");
             }
 
             // setup the list
@@ -3144,15 +3240,16 @@
                 // stop when we get to the end-of-list marker
 
                 // get the object
-                Object tmpObj = ObjectStateUtils.readObject(in, "MessageContext.metaInboundExecuted MetaDataEntry");
+                Object tmpObj = ObjectStateUtils
+                        .readObject(in, "MessageContext.metaInboundExecuted MetaDataEntry");
 
                 count++;
 
                 MetaDataEntry mdObj = (MetaDataEntry) tmpObj;
 
                 // get the class name, then add it to the list
-                String tmpClassNameStr ;
-                String tmpQNameAsStr ;
+                String tmpClassNameStr;
+                String tmpQNameAsStr;
                 String tmpHasList = "no list";
 
                 if (mdObj != null) {
@@ -3172,7 +3269,10 @@
                         }
 
                         if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-                          log.trace(logCorrelationIDString + ":readExternal(): meta data class [" + tmpClassNameStr + "] qname [" + tmpQNameAsStr + "]  index [" + count + "]   [" + tmpHasList + "]");
+                            log.trace(logCorrelationIDString +
+                                    ":readExternal(): meta data class [" + tmpClassNameStr +
+                                    "] qname [" + tmpQNameAsStr + "]  index [" + count + "]   [" +
+                                    tmpHasList + "]");
                         }
                     }
                 } else {
@@ -3185,14 +3285,17 @@
             int adjustedNumberInExecList = in.readInt();
 
             if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-              log.trace(logCorrelationIDString + ":readExternal(): adjusted number of entries InboundExecutedPhases [" + adjustedNumberInExecList + "]    ");
+                log.trace(logCorrelationIDString +
+                        ":readExternal(): adjusted number of entries InboundExecutedPhases [" +
+                        adjustedNumberInExecList + "]    ");
             }
         }
 
         if ((metaInboundExecuted == null) || (metaInboundExecuted.isEmpty())) {
-          if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-            log.trace(logCorrelationIDString + ":readExternal(): meta data for InboundExecutedPhases list is NULL");
-          }
+            if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
+                log.trace(logCorrelationIDString +
+                        ":readExternal(): meta data for InboundExecutedPhases list is NULL");
+            }
         }
 
         //---------------------------------------------------------
@@ -3202,7 +3305,7 @@
         // and the order of the list.
         // This metadata will be used to match up with phases
         // and handlers on the engine.
-        //    
+        //
         // Non-null list:
         //    UTF          - description string
         //    boolean      - active flag
@@ -3213,13 +3316,13 @@
         //                        with MetaDataEntry.LAST_ENTRY marker
         //    int          - adjusted number of entries in the list
         //                        includes the last empty entry
-        //    
+        //
         // Empty list:
         //    UTF          - description string
         //    boolean      - empty flag
         //---------------------------------------------------------
 
-        // the local chain is not enabled until the 
+        // the local chain is not enabled until the
         // list has been reconstituted
         outboundExecutedPhases = null;
         metaOutboundExecuted = null;
@@ -3231,7 +3334,9 @@
             int expectedNumberOutExecList = in.readInt();
 
             if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-              log.trace(logCorrelationIDString + ":readExternal(): outbound executed phases:  expected number of entries [" + expectedNumberOutExecList + "]");
+                log.trace(logCorrelationIDString +
+                        ":readExternal(): outbound executed phases:  expected number of entries [" +
+                        expectedNumberOutExecList + "]");
             }
 
             // setup the list
@@ -3245,7 +3350,8 @@
                 // stop when we get to the end-of-list marker
 
                 // get the object
-                Object tmpObj = ObjectStateUtils.readObject(in, "MessageContext.metaOutboundExecuted MetaDataEntry");
+                Object tmpObj = ObjectStateUtils
+                        .readObject(in, "MessageContext.metaOutboundExecuted MetaDataEntry");
 
                 count++;
 
@@ -3253,7 +3359,7 @@
 
                 // get the class name, then add it to the list
                 String tmpClassNameStr;
-                String tmpQNameAsStr ;
+                String tmpQNameAsStr;
                 String tmpHasList = "no list";
 
                 if (mdObj != null) {
@@ -3273,7 +3379,10 @@
                         }
 
                         if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-                          log.trace(logCorrelationIDString + ":readExternal(): OutboundExecutedPhases: meta data class [" + tmpClassNameStr + "] qname [" + tmpQNameAsStr + "]  index [" + count + "]   [" + tmpHasList + "]");
+                            log.trace(logCorrelationIDString +
+                                    ":readExternal(): OutboundExecutedPhases: meta data class [" +
+                                    tmpClassNameStr + "] qname [" + tmpQNameAsStr + "]  index [" +
+                                    count + "]   [" + tmpHasList + "]");
                         }
                     }
                 } else {
@@ -3286,14 +3395,17 @@
             int adjustedNumberOutExecList = in.readInt();
 
             if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-              log.trace(logCorrelationIDString + ":readExternal(): adjusted number of entries OutboundExecutedPhases [" + adjustedNumberOutExecList + "]    ");
+                log.trace(logCorrelationIDString +
+                        ":readExternal(): adjusted number of entries OutboundExecutedPhases [" +
+                        adjustedNumberOutExecList + "]    ");
             }
         }
 
         if ((metaOutboundExecuted == null) || (metaOutboundExecuted.isEmpty())) {
-          if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-            log.trace(logCorrelationIDString + ":readExternal(): meta data for OutboundExecutedPhases list is NULL");
-          }
+            if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
+                log.trace(logCorrelationIDString +
+                        ":readExternal(): meta data for OutboundExecutedPhases list is NULL");
+            }
         }
 
         //---------------------------------------------------------
@@ -3303,9 +3415,10 @@
         options = (Options) ObjectStateUtils.readObject(in, "MessageContext.options");
 
         if (options != null) {
-          if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-            log.trace(logCorrelationIDString + ":readExternal(): restored Options [" + options.getLogCorrelationIDString() + "]");
-          }
+            if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
+                log.trace(logCorrelationIDString + ":readExternal(): restored Options [" +
+                        options.getLogCorrelationIDString() + "]");
+            }
         }
 
         //---------------------------------------------------------
@@ -3320,19 +3433,22 @@
         boolean metaAxisOperationIsActive = in.readBoolean();
 
         if (metaAxisOperationIsActive == ObjectStateUtils.ACTIVE_OBJECT) {
-            metaAxisOperation = (MetaDataEntry) ObjectStateUtils.readObject(in, "MessageContext.metaAxisOperation");
+            metaAxisOperation = (MetaDataEntry) ObjectStateUtils
+                    .readObject(in, "MessageContext.metaAxisOperation");
         } else {
             metaAxisOperation = null;
         }
 
         // operation context is not usable until it has been activated
         // NOTE: expect this to be the parent
-        operationContext = (OperationContext) ObjectStateUtils.readObject(in, "MessageContext.operationContext");
+        operationContext = (OperationContext) ObjectStateUtils
+                .readObject(in, "MessageContext.operationContext");
 
         if (operationContext != null) {
-          if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-            log.trace(logCorrelationIDString + ":readExternal(): restored OperationContext [" + operationContext.getLogCorrelationIDString() + "]");
-          }
+            if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
+                log.trace(logCorrelationIDString + ":readExternal(): restored OperationContext [" +
+                        operationContext.getLogCorrelationIDString() + "]");
+            }
         }
 
         //---------------------------------------------------------
@@ -3347,7 +3463,8 @@
         boolean metaAxisServiceIsActive = in.readBoolean();
 
         if (metaAxisServiceIsActive == ObjectStateUtils.ACTIVE_OBJECT) {
-            metaAxisService = (MetaDataEntry) ObjectStateUtils.readObject(in, "MessageContext.metaAxisService");
+            metaAxisService = (MetaDataEntry) ObjectStateUtils
+                    .readObject(in, "MessageContext.metaAxisService");
         } else {
             metaAxisService = null;
         }
@@ -3377,7 +3494,8 @@
 
             // there's an object to read in if it is not the parent of the operation context
             if (!isParent) {
-                serviceContext = (ServiceContext) ObjectStateUtils.readObject(in, "MessageContext.serviceContext");
+                serviceContext = (ServiceContext) ObjectStateUtils
+                        .readObject(in, "MessageContext.serviceContext");
             } else {
                 // the service context is the parent of the operation context
                 // so get it from the operation context during activate
@@ -3397,7 +3515,8 @@
         boolean metaAxisServiceGrpIsActive = in.readBoolean();
 
         if (metaAxisServiceGrpIsActive == ObjectStateUtils.ACTIVE_OBJECT) {
-            metaAxisServiceGroup = (MetaDataEntry) ObjectStateUtils.readObject(in, "MessageContext.metaAxisServiceGroup");
+            metaAxisServiceGroup = (MetaDataEntry) ObjectStateUtils
+                    .readObject(in, "MessageContext.metaAxisServiceGroup");
         } else {
             metaAxisServiceGroup = null;
         }
@@ -3405,7 +3524,8 @@
         //-----------------------------
         // serviceGroupContextId string
         //-----------------------------
-        serviceGroupContextId = ObjectStateUtils.readString(in, "MessageContext.serviceGroupContextId");
+        serviceGroupContextId =
+                ObjectStateUtils.readString(in, "MessageContext.serviceGroupContextId");
 
         //-----------------------------
         // serviceGroupContext
@@ -3426,7 +3546,8 @@
 
             // there's an object to read in if it is not the parent of the service group context
             if (!isParentSGC) {
-                serviceGroupContext = (ServiceGroupContext) ObjectStateUtils.readObject(in, "MessageContext.serviceGroupContext");
+                serviceGroupContext = (ServiceGroupContext) ObjectStateUtils
+                        .readObject(in, "MessageContext.serviceGroupContext");
             } else {
                 // the service group context is the parent of the service context
                 // so get it from the service context during activate
@@ -3446,7 +3567,8 @@
         boolean metaAxisMessageIsActive = in.readBoolean();
 
         if (metaAxisMessageIsActive == ObjectStateUtils.ACTIVE_OBJECT) {
-            metaAxisMessage = (MetaDataEntry) ObjectStateUtils.readObject(in, "MessageContext.metaAxisMessage");
+            metaAxisMessage = (MetaDataEntry) ObjectStateUtils
+                    .readObject(in, "MessageContext.metaAxisMessage");
             reconcileAxisMessage = true;
         } else {
             metaAxisMessage = null;
@@ -3458,7 +3580,7 @@
         //---------------------------------------------------------
 
         // TODO: check to see if there is any runtime data important to this
-        //       message context in the configuration context 
+        //       message context in the configuration context
         //       if so, then need to restore the saved runtime data and reconcile
         //       it with the configuration context on the system when
         //       this message context object is restored
@@ -3467,7 +3589,8 @@
         // session context
         //---------------------------------------------------------
 
-        sessionContext = (SessionContext) ObjectStateUtils.readObject(in, "MessageContext.sessionContext");
+        sessionContext =
+                (SessionContext) ObjectStateUtils.readObject(in, "MessageContext.sessionContext");
 
         //---------------------------------------------------------
         // transport
@@ -3476,17 +3599,20 @@
         //------------------------------
         // incomingTransportName string
         //------------------------------
-        incomingTransportName = ObjectStateUtils.readString(in, "MessageContext.incomingTransportName");
+        incomingTransportName =
+                ObjectStateUtils.readString(in, "MessageContext.incomingTransportName");
 
         // TransportInDescription transportIn
         // is not usable until the meta data has been reconciled
         transportIn = null;
-        metaTransportIn = (MetaDataEntry) ObjectStateUtils.readObject(in, "MessageContext.metaTransportIn");
+        metaTransportIn =
+                (MetaDataEntry) ObjectStateUtils.readObject(in, "MessageContext.metaTransportIn");
 
         // TransportOutDescription transportOut
         // is not usable until the meta data has been reconciled
         transportOut = null;
-        metaTransportOut = (MetaDataEntry) ObjectStateUtils.readObject(in, "MessageContext.metaTransportOut");
+        metaTransportOut =
+                (MetaDataEntry) ObjectStateUtils.readObject(in, "MessageContext.metaTransportOut");
 
         //---------------------------------------------------------
         // properties
@@ -3503,7 +3629,7 @@
         // special data
         //---------------------------------------------------------
 
-       ObjectStateUtils.readString(in, "MessageContext.selfManagedData");
+        ObjectStateUtils.readString(in, "MessageContext.selfManagedData");
 
         boolean gotSelfManagedData = in.readBoolean();
 
@@ -3527,7 +3653,9 @@
 
         // trace point
         if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-          log.trace(logCorrelationIDString + ":readExternal():  message context object created for  " + logCorrelationIDString);
+            log.trace(logCorrelationIDString +
+                    ":readExternal():  message context object created for  " +
+                    logCorrelationIDString);
         }
     }
 
@@ -3553,17 +3681,21 @@
         // use the supplied configuration context
         setConfigurationContext(cc);
 
-        // get the axis configuration 
+        // get the axis configuration
         AxisConfiguration axisConfig = configurationContext.getAxisConfiguration();
 
         // We previously saved metaAxisService; restore it
         if (metaAxisService != null) {
-            this.setAxisService(ObjectStateUtils.findService(axisConfig, metaAxisService.getClassName(), metaAxisService.getQNameAsString()));
+            this.setAxisService(ObjectStateUtils.findService(axisConfig,
+                                                             metaAxisService.getClassName(),
+                                                             metaAxisService.getQNameAsString()));
         }
 
         // We previously saved metaAxisServiceGroup; restore it
         if (metaAxisServiceGroup != null) {
-            this.setAxisServiceGroup(ObjectStateUtils.findServiceGroup(axisConfig, metaAxisServiceGroup.getClassName(), metaAxisServiceGroup.getQNameAsString()));
+            this.setAxisServiceGroup(ObjectStateUtils.findServiceGroup(axisConfig,
+                                                                       metaAxisServiceGroup.getClassName(),
+                                                                       metaAxisServiceGroup.getQNameAsString()));
         }
 
         // We previously saved metaAxisOperation; restore it
@@ -3571,10 +3703,14 @@
             AxisService serv = axisService;
 
             if (serv != null) {
-                // TODO: check for the empty name 
-                this.setAxisOperation(ObjectStateUtils.findOperation(serv, metaAxisOperation.getClassName(), metaAxisOperation.getQName()));
+                // TODO: check for the empty name
+                this.setAxisOperation(ObjectStateUtils.findOperation(serv,
+                                                                     metaAxisOperation.getClassName(),
+                                                                     metaAxisOperation.getQName()));
             } else {
-                this.setAxisOperation(ObjectStateUtils.findOperation(axisConfig, metaAxisOperation.getClassName(), metaAxisOperation.getQName()));
+                this.setAxisOperation(ObjectStateUtils.findOperation(axisConfig,
+                                                                     metaAxisOperation.getClassName(),
+                                                                     metaAxisOperation.getQName()));
             }
         }
 
@@ -3583,8 +3719,10 @@
             AxisOperation op = axisOperation;
 
             if (op != null) {
-                // TODO: check for the empty name 
-                this.setAxisMessage(ObjectStateUtils.findMessage(op, metaAxisMessage.getQNameAsString(), metaAxisMessage.getExtraName()));
+                // TODO: check for the empty name
+                this.setAxisMessage(ObjectStateUtils.findMessage(op,
+                                                                 metaAxisMessage.getQNameAsString(),
+                                                                 metaAxisMessage.getExtraName()));
             }
         }
 
@@ -3654,7 +3792,8 @@
         String logCorrelationIDString = getLogIDString();
 
         if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-          log.trace(logCorrelationIDString + ":activate():   message ID [" + tmpID + "] for " + logCorrelationIDString);
+            log.trace(logCorrelationIDString + ":activate():   message ID [" + tmpID + "] for " +
+                    logCorrelationIDString);
         }
 
         //---------------------------------------------------------------------
@@ -3670,7 +3809,10 @@
             }
             catch (Exception exin) {
                 // if a fault is thrown, log it and continue
-                log.trace(logCorrelationIDString + "activate():  exception caught when getting the TransportInDescription [" + qin.toString() + "]  from the AxisConfiguration [" + exin.getClass().getName() + " : " + exin.getMessage() + "]");
+                log.trace(logCorrelationIDString +
+                        "activate():  exception caught when getting the TransportInDescription [" +
+                        qin.toString() + "]  from the AxisConfiguration [" +
+                        exin.getClass().getName() + " : " + exin.getMessage() + "]");
             }
 
             if (tmpIn != null) {
@@ -3691,7 +3833,10 @@
             }
             catch (Exception exout) {
                 // if a fault is thrown, log it and continue
-                log.info(logCorrelationIDString + "activate():  exception caught when getting the TransportOutDescription [" + qout.toString() + "]  from the AxisConfiguration [" + exout.getClass().getName() + " : " + exout.getMessage() + "]");
+                log.info(logCorrelationIDString +
+                        "activate():  exception caught when getting the TransportOutDescription [" +
+                        qout.toString() + "]  from the AxisConfiguration [" +
+                        exout.getClass().getName() + " : " + exout.getMessage() + "]");
             }
 
             if (tmpOut != null) {
@@ -3708,7 +3853,8 @@
         //-------------------------------------------------------
         if (metaExecutionChain != null) {
             if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-              log.trace(logCorrelationIDString + ":activate(): reconciling the execution chain...");
+                log.trace(
+                        logCorrelationIDString + ":activate(): reconciling the execution chain...");
             }
 
             currentHandlerIndex = metaHandlerIndex;
@@ -3721,7 +3867,9 @@
             }
             catch (Exception ex) {
                 // log the exception
-                log.trace(logCorrelationIDString + ":activate(): *** WARNING *** deserializing the self managed data encountered Exception [" + ex.getClass().getName() + " : " + ex.getMessage() + "]", ex);
+                log.trace(logCorrelationIDString +
+                        ":activate(): *** WARNING *** deserializing the self managed data encountered Exception [" +
+                        ex.getClass().getName() + " : " + ex.getMessage() + "]", ex);
             }
         }
 
@@ -3730,11 +3878,13 @@
         //-------------------------------------------------------
         if (metaInboundExecuted != null) {
             if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-              log.trace(logCorrelationIDString + ":activate(): reconciling the inbound executed chain...");
+                log.trace(logCorrelationIDString +
+                        ":activate(): reconciling the inbound executed chain...");
             }
 
             if (!(inboundReset)) {
-                inboundExecutedPhases = restoreExecutedList(inboundExecutedPhases, metaInboundExecuted);
+                inboundExecutedPhases =
+                        restoreExecutedList(inboundExecutedPhases, metaInboundExecuted);
             }
         }
 
@@ -3745,11 +3895,13 @@
 
         if (metaOutboundExecuted != null) {
             if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-              log.trace(logCorrelationIDString + ":activate(): reconciling the outbound executed chain...");
+                log.trace(logCorrelationIDString +
+                        ":activate(): reconciling the outbound executed chain...");
             }
 
             if (!(outboundReset)) {
-                outboundExecutedPhases = restoreExecutedList(outboundExecutedPhases, metaOutboundExecuted);
+                outboundExecutedPhases =
+                        restoreExecutedList(outboundExecutedPhases, metaOutboundExecuted);
             }
         }
 
@@ -3795,12 +3947,13 @@
         String logCorrelationIDString = getLogIDString();
         // trace point
         if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-          log.trace(logCorrelationIDString + ":activateWithOperationContext():  BEGIN");
+            log.trace(logCorrelationIDString + ":activateWithOperationContext():  BEGIN");
         }
 
         if (operationCtx == null) {
             // won't be able to finish
-            log.trace(logCorrelationIDString + ":activateWithOperationContext():  *** WARNING ***  No active OperationContext object is available.");
+            log.trace(logCorrelationIDString +
+                    ":activateWithOperationContext():  *** WARNING ***  No active OperationContext object is available.");
             return;
         }
 
@@ -3811,7 +3964,8 @@
 
         if (configCtx == null) {
             // won't be able to finish
-            log.trace(logCorrelationIDString + ":activateWithOperationContext():  *** WARNING ***  No active ConfigurationContext object is available.");
+            log.trace(logCorrelationIDString +
+                    ":activateWithOperationContext():  *** WARNING ***  No active ConfigurationContext object is available.");
             return;
         }
 
@@ -3854,8 +4008,10 @@
         // We previously saved metaAxisMessage; restore it
         if (metaAxisMessage != null) {
             if (axisOp != null) {
-                // TODO: check for the empty name 
-                this.setAxisMessage(ObjectStateUtils.findMessage(axisOp, metaAxisMessage.getQNameAsString(), metaAxisMessage.getExtraName()));
+                // TODO: check for the empty name
+                this.setAxisMessage(ObjectStateUtils.findMessage(axisOp,
+                                                                 metaAxisMessage.getQNameAsString(),
+                                                                 metaAxisMessage.getExtraName()));
             }
         }
 
@@ -3869,7 +4025,8 @@
         String tmpID = getMessageID();
 
         if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-          log.trace(logCorrelationIDString + ":activateWithOperationContext():   message ID [" + tmpID + "]");
+            log.trace(logCorrelationIDString + ":activateWithOperationContext():   message ID [" +
+                    tmpID + "]");
         }
 
         //---------------------------------------------------------------------
@@ -3885,7 +4042,10 @@
             }
             catch (Exception exin) {
                 // if a fault is thrown, log it and continue
-                log.info(logCorrelationIDString + "activateWithOperationContext():  exception caught when getting the TransportInDescription [" + qin.toString() + "]  from the AxisConfiguration [" + exin.getClass().getName() + " : " + exin.getMessage() + "]");
+                log.info(logCorrelationIDString +
+                        "activateWithOperationContext():  exception caught when getting the TransportInDescription [" +
+                        qin.toString() + "]  from the AxisConfiguration [" +
+                        exin.getClass().getName() + " : " + exin.getMessage() + "]");
 
             }
 
@@ -3907,7 +4067,10 @@
             }
             catch (Exception exout) {
                 // if a fault is thrown, log it and continue
-                log.info(logCorrelationIDString + "activateWithOperationContext():  exception caught when getting the TransportOutDescription [" + qout.toString() + "]  from the AxisConfiguration [" + exout.getClass().getName() + " : " + exout.getMessage() + "]");
+                log.info(logCorrelationIDString +
+                        "activateWithOperationContext():  exception caught when getting the TransportOutDescription [" +
+                        qout.toString() + "]  from the AxisConfiguration [" +
+                        exout.getClass().getName() + " : " + exout.getMessage() + "]");
 
             }
 
@@ -3925,7 +4088,8 @@
         //-------------------------------------------------------
         if (metaExecutionChain != null) {
             if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-              log.trace(logCorrelationIDString + ":activateWithOperationContext(): reconciling the execution chain...");
+                log.trace(logCorrelationIDString +
+                        ":activateWithOperationContext(): reconciling the execution chain...");
             }
 
             currentHandlerIndex = metaHandlerIndex;
@@ -3938,7 +4102,9 @@
             }
             catch (Exception ex) {
                 // log the exception
-                log.trace(logCorrelationIDString + ":activateWithOperationContext(): *** WARNING *** deserializing the self managed data encountered Exception [" + ex.getClass().getName() + " : " + ex.getMessage() + "]", ex);
+                log.trace(logCorrelationIDString +
+                        ":activateWithOperationContext(): *** WARNING *** deserializing the self managed data encountered Exception [" +
+                        ex.getClass().getName() + " : " + ex.getMessage() + "]", ex);
             }
         }
 
@@ -3947,11 +4113,13 @@
         //-------------------------------------------------------
         if (metaInboundExecuted != null) {
             if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-              log.trace(logCorrelationIDString + ":activateWithOperationContext(): reconciling the inbound executed chain...");
+                log.trace(logCorrelationIDString +
+                        ":activateWithOperationContext(): reconciling the inbound executed chain...");
             }
 
             if (!(inboundReset)) {
-                inboundExecutedPhases = restoreExecutedList(inboundExecutedPhases, metaInboundExecuted);
+                inboundExecutedPhases =
+                        restoreExecutedList(inboundExecutedPhases, metaInboundExecuted);
             }
         }
 
@@ -3962,11 +4130,13 @@
 
         if (metaOutboundExecuted != null) {
             if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-              log.trace(logCorrelationIDString + ":activateWithOperationContext(): reconciling the outbound executed chain...");
+                log.trace(logCorrelationIDString +
+                        ":activateWithOperationContext(): reconciling the outbound executed chain...");
             }
 
             if (!(outboundReset)) {
-                outboundExecutedPhases = restoreExecutedList(outboundExecutedPhases, metaOutboundExecuted);
+                outboundExecutedPhases =
+                        restoreExecutedList(outboundExecutedPhases, metaOutboundExecuted);
             }
         }
 
@@ -3980,7 +4150,7 @@
         needsToBeReconciled = false;
 
         if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-          log.trace(logCorrelationIDString + ":activateWithOperationContext():  END");
+            log.trace(logCorrelationIDString + ":activateWithOperationContext():  END");
         }
     }
 
@@ -3995,7 +4165,7 @@
         ArrayList existingHandlers = null;
 
         // TODO: I'm using clone for the ArrayList returned from axisConfig object.
-        //     Does it do a deep clone of the Handlers held there?  Does it matter? 
+        //     Does it do a deep clone of the Handlers held there?  Does it matter?
         switch (FLOW) {
             case IN_FLOW:
                 existingHandlers = (ArrayList) axisConfig.getGlobalInFlow().clone();
@@ -4019,7 +4189,8 @@
         ArrayList handlerListToReturn = new ArrayList();
 
         for (int i = 0; i < metaDataEntries.size(); i++) {
-            Handler handler = (Handler) ObjectStateUtils.findHandler(existingHandlers, (MetaDataEntry) metaDataEntries.get(i));
+            Handler handler = (Handler) ObjectStateUtils
+                    .findHandler(existingHandlers, (MetaDataEntry) metaDataEntries.get(i));
 
             if (handler != null) {
                 handlerListToReturn.add(handler);
@@ -4047,7 +4218,7 @@
 
         // get a list of existing handler/phase objects for the restored objects
 
-        ArrayList tmpMetaDataList = new ArrayList( metaDataEntries);
+        ArrayList tmpMetaDataList = new ArrayList(metaDataEntries);
 
         ArrayList existingList = restoreHandlerList(tmpMetaDataList);
 
@@ -4060,7 +4231,7 @@
         LinkedList returnedList = new LinkedList();
 
         if (base != null) {
-            returnedList.addAll( base);
+            returnedList.addAll(base);
         }
 
         returnedList.addAll(existingList);
@@ -4103,7 +4274,7 @@
                 mdEntry.setClassName(objClass);
 
                 // get the correct object-specific name
-                String qnameAsString ;
+                String qnameAsString;
 
                 if (obj instanceof Phase) {
                     // nested condition, the phase object contains another phase!
@@ -4116,7 +4287,7 @@
                     Handler handlerObj = (Handler) obj;
                     qnameAsString = handlerObj.getName();
                 } else {
-                    // TODO: will there be any other kinds of objects 
+                    // TODO: will there be any other kinds of objects
                     // in the list?
                     qnameAsString = "NULL";
                 }
@@ -4128,7 +4299,8 @@
                 mdPhase.addToList(mdEntry);
 
                 if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-                  log.trace(getLogIDString() + ":setupPhaseList(): list entry class [" + objClass + "] qname [" + qnameAsString + "]");
+                    log.trace(getLogIDString() + ":setupPhaseList(): list entry class [" +
+                            objClass + "] qname [" + qnameAsString + "]");
                 }
 
             } // end while entries in list
@@ -4157,7 +4329,8 @@
         MessageContext copy = new MessageContext();
         String logCorrelationIDString = getLogIDString();
         if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-          log.trace(logCorrelationIDString + ":extractCopyMessageContext():  based on " + logCorrelationIDString + "   into copy " + copy.getLogIDString());
+            log.trace(logCorrelationIDString + ":extractCopyMessageContext():  based on " +
+                    logCorrelationIDString + "   into copy " + copy.getLogIDString());
         }
 
         //---------------------------------------------------------
@@ -4185,7 +4358,9 @@
             copy.setEnvelope(envelope);
         }
         catch (Exception ex) {
-            log.trace(logCorrelationIDString + ":extractCopyMessageContext():  Exception caught when setting the copy with the envelope", ex);
+            log.trace(logCorrelationIDString +
+                    ":extractCopyMessageContext():  Exception caught when setting the copy with the envelope",
+                      ex);
         }
 
         copy.setAttachmentMap(attachments);
@@ -4193,8 +4368,8 @@
         copy.setIsSOAP11Explicit(isSOAP11);
 
         //---------------------------------------------------------
-        // ArrayList executionChain 
-        //     handler and phase related data 
+        // ArrayList executionChain
+        //     handler and phase related data
         //---------------------------------------------------------
         copy.setExecutionChain(executionChain);
 
@@ -4204,12 +4379,12 @@
         copy.setCurrentPhaseIndex(currentPhaseIndex);
 
         //---------------------------------------------------------
-        // LinkedList inboundExecutedPhases 
+        // LinkedList inboundExecutedPhases
         //---------------------------------------------------------
         copy.setInboundExecutedPhasesExplicit(inboundExecutedPhases);
 
         //---------------------------------------------------------
-        // LinkedList outboundExecutedPhases 
+        // LinkedList outboundExecutedPhases
         //---------------------------------------------------------

[... 30 lines stripped ...]


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