Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 37B46101AF for ; Fri, 8 Nov 2013 17:24:29 +0000 (UTC) Received: (qmail 9425 invoked by uid 500); 8 Nov 2013 17:24:28 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 9384 invoked by uid 500); 8 Nov 2013 17:24: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 9351 invoked by uid 99); 8 Nov 2013 17:24:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Nov 2013 17:24:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Fri, 08 Nov 2013 17:24:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 02EAE23888E7; Fri, 8 Nov 2013 17:24:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1540130 - in /cxf/branches/2.7.x-fixes: ./ api/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java Date: Fri, 08 Nov 2013 17:24:02 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131108172403.02EAE23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Fri Nov 8 17:24:02 2013 New Revision: 1540130 URL: http://svn.apache.org/r1540130 Log: Merged revisions 1540127 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1540127 | sergeyb | 2013-11-08 17:17:34 +0000 (Fri, 08 Nov 2013) | 1 line [CXF-5377] Check REQUEST_URI if no REQUEST_URL property is available ........ Modified: cxf/branches/2.7.x-fixes/ (props changed) cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1540127 Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java?rev=1540130&r1=1540129&r2=1540130&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java (original) +++ cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java Fri Nov 8 17:24:02 2013 @@ -116,6 +116,9 @@ public class LoggingInInterceptor extend buffer.getHeader().append(headers); } String uri = (String)message.get(Message.REQUEST_URL); + if (uri == null) { + uri = (String)message.get(Message.REQUEST_URI); + } if (uri != null) { buffer.getAddress().append(uri); String query = (String)message.get(Message.QUERY_STRING);