Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1099656 - in /cxf/branches/2.3.x-fixes: ./
 rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
Date: Thu, 05 May 2011 01:43:11 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
Message-Id: <20110505014311.152BD23889E3@eris.apache.org>

Author: dkulp
Date: Thu May  5 01:43:10 2011
New Revision: 1099656

URL: http://svn.apache.org/viewvc?rev=1099656&view=rev
Log:
Merged revisions 1099178 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1099178 | ericjohnson | 2011-05-03 14:32:06 -0400 (Tue, 03 May 2011) | 1 line
  
  cleaned up some of the Javadoc comments
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java?rev=1099656&r1=1099655&r2=1099656&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java Thu May  5 01:43:10 2011
@@ -56,10 +56,10 @@ import org.springframework.jms.listener.
 import org.springframework.jms.support.JmsUtils;
 
 /**
- * JMSConduit is instantiated by the JMSTransportfactory which is selected by a client if the transport
- * protocol starts with jms:// JMSConduit converts CXF Messages to JMS Messages and sends the request by using
- * a JMS destination. If the Exchange is not oneway it then recevies the response and converts it to a CXF
- * Message. This is then provided in the Exchange and also sent to the incomingObserver
+ * JMSConduit is instantiated by the JMSTransportFactory which is selected by a client if the transport
+ * protocol starts with jms://. JMSConduit converts CXF Messages to JMS Messages and sends the request by 
+ * using a JMS destination. If the Exchange is not oneway it then recevies the response and converts it to 
+ * a CXF Message. This is then provided in the Exchange and also sent to the incomingObserver.
  */
 public class JMSConduit extends AbstractConduit implements JMSExchangeSender, MessageListener {
 
@@ -91,8 +91,8 @@ public class JMSConduit extends Abstract
     }
     
     /**
-     * Prepare the message for send out. The message will be sent after the caller has written the payload to
-     * the OutputStream of the message and calls the close method of the stream. In the JMS case the
+     * Prepare the message to be sent. The message will be sent after the caller has written the payload to
+     * the OutputStream of the message and called the stream's close method. In the JMS case the
      * JMSOutputStream will then call back the sendExchange method of this class. {@inheritDoc}
      */
     public void prepare(Message message) throws IOException {
@@ -131,11 +131,10 @@ public class JMSConduit extends Abstract
     }
 
     /**
-     * Send the JMS Request out and if not oneWay receive the response
+     * Send the JMS message and if the MEP is not oneway receive the response.
      * 
-     * @param outMessage
-     * @param request
-     * @return inMessage
+     * @param exchange the Exchange containing the outgoing message
+     * @param request  the payload of the outgoing JMS message
      */
     public void sendExchange(final Exchange exchange, final Object request) {
         LOG.log(Level.FINE, "JMSConduit send message");
@@ -370,7 +369,7 @@ public class JMSConduit extends Abstract
     }
 
     /**
-     * Here we just deal with the reply message
+     * Process the reply message
      */
     public void doReplyMessage(Exchange exchange, javax.jms.Message jmsMessage) {
         Message inMessage = new MessageImpl();