Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 72090 invoked from network); 30 Oct 2009 18:44:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 30 Oct 2009 18:44:20 -0000 Received: (qmail 79916 invoked by uid 500); 30 Oct 2009 18:44:20 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 79866 invoked by uid 500); 30 Oct 2009 18:44:20 -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 79857 invoked by uid 99); 30 Oct 2009 18:44:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Oct 2009 18:44:20 +0000 X-ASF-Spam-Status: No, hits=-2.7 required=5.0 tests=AWL,BAYES_00 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, 30 Oct 2009 18:44:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 52692238897D; Fri, 30 Oct 2009 18:43:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r831418 - in /cxf/branches/2.2.x-fixes: ./ common/common/src/main/java/org/apache/cxf/resource/URIResolver.java Date: Fri, 30 Oct 2009 18:43:55 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091030184355.52692238897D@eris.apache.org> Author: dkulp Date: Fri Oct 30 18:43:54 2009 New Revision: 831418 URL: http://svn.apache.org/viewvc?rev=831418&view=rev Log: Merged revisions 831417 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r831417 | dkulp | 2009-10-30 14:40:20 -0400 (Fri, 30 Oct 2009) | 1 line Add NPE guard ........ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java?rev=831418&r1=831417&r2=831418&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java (original) +++ cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java Fri Oct 30 18:43:54 2009 @@ -205,7 +205,10 @@ // do nothing } - if (uri != null && "file".equals(uri.getScheme())) { + if (is == null && baseUriStr != null && baseUriStr.startsWith("classpath:")) { + tryClasspath(baseUriStr + uriStr); + } + if (is == null && uri != null && "file".equals(uri.getScheme())) { try { file = new File(uri); } catch (IllegalArgumentException iae) {