You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/03/11 18:35:02 UTC
svn commit: r921956 - in /cxf/branches/2.2.x-fixes: ./
common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
Author: dkulp
Date: Thu Mar 11 17:35:02 2010
New Revision: 921956
URL: http://svn.apache.org/viewvc?rev=921956&view=rev
Log:
Merged revisions 921955 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r921955 | dkulp | 2010-03-11 12:34:14 -0500 (Thu, 11 Mar 2010) | 1 line
fix line length
........
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/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:921955
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=921956&r1=921955&r2=921956&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 Thu Mar 11 17:35:02 2010
@@ -291,8 +291,9 @@ public class URIResolver {
try {
uri = url.toURI();
} catch (URISyntaxException e) {
- // yep, some versions of the JDK can't handle spaces when URL.toURI() is called, and lots of people
- // on windows have their maven repositories at C:/Documents and Settings/<userid>/.m2/repository
+ // yep, some versions of the JDK can't handle spaces when URL.toURI() is called,
+ // and lots of people on windows have their maven repositories at
+ // C:/Documents and Settings/<userid>/.m2/repository
// re: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6506304
if (url.toString().contains(" ")) {
url = new URL(url.toString().replace(" ", "%20"));