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 2008/05/12 23:09:03 UTC
svn commit: r655641 -
/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
Author: dkulp
Date: Mon May 12 14:09:02 2008
New Revision: 655641
URL: http://svn.apache.org/viewvc?rev=655641&view=rev
Log:
[CXF-1583,CXF-1584] Patches for issues with the classpath and dynamic client applied from Alton Idowu
Modified:
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=655641&r1=655640&r2=655641&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java Mon May 12 14:09:02 2008
@@ -61,7 +61,6 @@
import org.apache.cxf.Bus;
import org.apache.cxf.bus.CXFBusFactory;
import org.apache.cxf.common.i18n.Message;
-import org.apache.cxf.common.i18n.UncheckedException;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.endpoint.Client;
@@ -404,20 +403,22 @@
URL[] urls = ((URLClassLoader)tcl).getURLs();
for (URL url : urls) {
if (url.getProtocol().startsWith("file")) {
- try {
- File file = new File(url.toURI().getPath());
- if (file.exists()) {
- classPath.append(file.getAbsolutePath())
- .append(System
- .getProperty("path.separator"));
- }
-
- if (file.getName().endsWith(".jar")) {
- addClasspathFromManifest(classPath, file);
- }
- } catch (URISyntaxException e) {
- throw new UncheckedException(e);
- }
+ File file;
+ try {
+ file = new File(url.toURI().getPath());
+ } catch (URISyntaxException urise) {
+ file = new File(url.getPath());
+ }
+
+ if (file.exists()) {
+ classPath.append(file.getAbsolutePath())
+ .append(System
+ .getProperty("path.separator"));
+
+ if (file.getName().endsWith(".jar")) {
+ addClasspathFromManifest(classPath, file);
+ }
+ }
}
}
}