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 F2717667D for ; Thu, 26 May 2011 20:15:36 +0000 (UTC) Received: (qmail 26502 invoked by uid 500); 26 May 2011 20:15:36 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 26453 invoked by uid 500); 26 May 2011 20:15:36 -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 26446 invoked by uid 99); 26 May 2011 20:15:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 May 2011 20:15:36 +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; Thu, 26 May 2011 20:15:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6C94B23889E7; Thu, 26 May 2011 20:15:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1128061 - /cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java Date: Thu, 26 May 2011 20:15:11 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110526201511.6C94B23889E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Thu May 26 20:15:11 2011 New Revision: 1128061 URL: http://svn.apache.org/viewvc?rev=1128061&view=rev Log: Fixing JAXRSJmsTest system test Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java?rev=1128061&r1=1128060&r2=1128061&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java Thu May 26 20:15:11 2011 @@ -185,7 +185,7 @@ public class RequestPreprocessor { if (baseAddress.equals(requestURI)) { return handleMetadataRequest(m); } - } else if (originalRequestURI.endsWith(".xsd")) { + } else if (originalRequestURI != null && originalRequestURI.endsWith(".xsd")) { // trying WADLGenerator which may be caching schema resources won't // interfere with custom schema handlers if any return handleMetadataRequest(m);