cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r582890 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
Date Mon, 08 Oct 2007 17:11:24 GMT
Author: dkulp
Date: Mon Oct  8 10:11:23 2007
New Revision: 582890

URL: http://svn.apache.org/viewvc?rev=582890&view=rev
Log:
Merged revisions 578637 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r578637 | mmao | 2007-09-23 23:50:38 -0400 (Sun, 23 Sep 2007) | 6 lines
  
  * CXF-1053 
    Fix the build on Windows Vista, 
  
  * Enable the AegisTest, it works on Windows, previous problem was caused by the remove of
the javato/core
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java?rev=582890&r1=582889&r2=582890&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
Mon Oct  8 10:11:23 2007
@@ -116,18 +116,16 @@
             if ("file".equals(catalogURL.getProtocol())) {
                 try {
                     File file = new File(catalogURL.toURI());
-                    if (file.exists()) {
-                        this.resolver.parseCatalog(file.getAbsolutePath());
-                    } else {
+                    if (!file.exists()) {
                         throw new FileNotFoundException(file.getAbsolutePath());
                     }
                 } catch (URISyntaxException e) {
                     //just process as is
-                    this.resolver.parseCatalog(catalogURL);
                 }
-            } else {
-                this.resolver.parseCatalog(catalogURL);
             }
+
+            this.resolver.parseCatalog(catalogURL);
+
             loadedCatalogs.add(catalogURL);
         }
     }



Mime
View raw message