Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 53002 invoked from network); 16 Feb 2010 10:49:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 16 Feb 2010 10:49:28 -0000 Received: (qmail 41518 invoked by uid 500); 16 Feb 2010 10:49:28 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 41435 invoked by uid 500); 16 Feb 2010 10:49:28 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 41426 invoked by uid 99); 16 Feb 2010 10:49:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Feb 2010 10:49:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Feb 2010 10:49:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0960B23889B2; Tue, 16 Feb 2010 10:49:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r910464 - in /cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms: JMSDestination.java JMSUtils.java Date: Tue, 16 Feb 2010 10:49:04 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100216104905.0960B23889B2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Tue Feb 16 10:49:04 2010 New Revision: 910464 URL: http://svn.apache.org/viewvc?rev=910464&view=rev Log: Minor update to JMS transport to ensure that messages with no entity body can be handled properly Modified: cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java Modified: cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java?rev=910464&r1=910463&r2=910464&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java (original) +++ cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java Tue Feb 16 10:49:04 2010 @@ -188,8 +188,10 @@ JMSConstants.JMS_SERVER_REQUEST_HEADERS, jmsConfig); byte[] request = JMSUtils.retrievePayload(message, (String)inMessage.get(Message.ENCODING)); - getLogger().log(Level.FINE, "The Request Message is [ " + request + "]"); - inMessage.setContent(InputStream.class, new ByteArrayInputStream(request)); + if (request != null) { + getLogger().log(Level.FINE, "The Request Message is [ " + request + "]"); + inMessage.setContent(InputStream.class, new ByteArrayInputStream(request)); + } inMessage.put(JMSConstants.JMS_SERVER_RESPONSE_HEADERS, new JMSMessageHeadersType()); inMessage.put(JMSConstants.JMS_REQUEST_MESSAGE, message); inMessage.setDestination(this); Modified: cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java?rev=910464&r1=910463&r2=910464&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java (original) +++ cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java Tue Feb 16 10:49:04 2010 @@ -129,7 +129,7 @@ } else if (converted instanceof byte[]) { return (byte[])converted; } else { - return (byte[])converted; // TODO is this correct? + return null; } }