cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1182976 - in /cxf/branches/2.3.x-fixes: ./ tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
Date Thu, 13 Oct 2011 16:52:40 GMT
Author: dkulp
Date: Thu Oct 13 16:52:40 2011
New Revision: 1182976

URL: http://svn.apache.org/viewvc?rev=1182976&view=rev
Log:
Merged revisions 1182944 via svnmerge from 
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1182944 | dkulp | 2011-10-13 12:13:59 -0400 (Thu, 13 Oct 2011) | 10 lines
  
  Merged revisions 1182925 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1182925 | dkulp | 2011-10-13 11:52:32 -0400 (Thu, 13 Oct 2011) | 2 lines
    
    Fix another issue with Felix not being able to create the proxies for
    the various wsdl extensor things.
  ........
................

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java

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

Modified: cxf/branches/2.3.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java?rev=1182976&r1=1182975&r2=1182976&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
(original)
+++ cxf/branches/2.3.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
Thu Oct 13 16:52:40 2011
@@ -88,14 +88,17 @@ public final class SOAPBindingUtil {
         try {
             proxy = Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(),
                                               new Class[] {cls}, ih);
-        } catch (IllegalArgumentException ex) {
+        } catch (Throwable ex) {
             // Using cls classloader as a fallback to make it work within OSGi  
             ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
             if (contextLoader != cls.getClassLoader()) {
                 proxy = Proxy.newProxyInstance(cls.getClassLoader(),
                                               new Class[] {cls}, ih);
             } else {
-                throw ex;
+                if (ex instanceof RuntimeException) {
+                    throw (RuntimeException)ex;
+                }
+                throw new RuntimeException(ex);
             }
         }
         return cls.cast(proxy);



Mime
View raw message