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 78E839D3A for ; Thu, 8 Nov 2012 08:58:42 +0000 (UTC) Received: (qmail 85085 invoked by uid 500); 8 Nov 2012 08:58:42 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 85020 invoked by uid 500); 8 Nov 2012 08:58:41 -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 85002 invoked by uid 99); 8 Nov 2012 08:58:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Nov 2012 08:58:41 +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, 08 Nov 2012 08:58:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3BF8E2388993; Thu, 8 Nov 2012 08:58:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1406962 - in /cxf/branches/2.6.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java Date: Thu, 08 Nov 2012 08:58:20 -0000 To: commits@cxf.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121108085820.3BF8E2388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ffang Date: Thu Nov 8 08:58:19 2012 New Revision: 1406962 URL: http://svn.apache.org/viewvc?rev=1406962&view=rev Log: Merged revisions 1406958 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1406958 | ffang | 2012-11-08 16:48:30 +0800 (四, 08 11 2012) | 1 line [CXF-4620]Exception at compilation when a 'space' character is present in maven local repository path ........ Modified: cxf/branches/2.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1406958 Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java?rev=1406962&r1=1406961&r2=1406962&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java (original) +++ cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java Thu Nov 8 08:58:19 2012 @@ -144,15 +144,15 @@ public class OASISCatalogManager { Enumeration catalogs = classLoader.getResources(name); while (catalogs.hasMoreElements()) { URL catalogURL = catalogs.nextElement(); - if (!loadedCatalogs.contains(URI.create(catalogURL.toString()))) { + if (!loadedCatalogs.contains(URI.create(replaceWhitespace(catalogURL.toString())))) { ((Catalog)catalog).parseCatalog(catalogURL); - loadedCatalogs.add(URI.create(catalogURL.toString())); + loadedCatalogs.add(URI.create(replaceWhitespace(catalogURL.toString()))); } } } public final void loadCatalog(URL catalogURL) throws IOException { - if (!loadedCatalogs.contains(URI.create(catalogURL.toString())) && catalog != null) { + if (!loadedCatalogs.contains(URI.create(replaceWhitespace(catalogURL.toString()))) && catalog != null) { if ("file".equals(catalogURL.getProtocol())) { try { File file = new File(catalogURL.toURI()); @@ -166,9 +166,16 @@ public class OASISCatalogManager { ((Catalog)catalog).parseCatalog(catalogURL); - loadedCatalogs.add(URI.create(catalogURL.toString())); + loadedCatalogs.add(URI.create(replaceWhitespace(catalogURL.toString()))); } } + + private String replaceWhitespace(String str) { + if (str.contains(" ")) { + str = str.replace(" ", "%20"); + } + return str; + } private static OASISCatalogManager getContextCatalog() { try {