You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2011/02/08 20:13:04 UTC
svn commit: r1068530 - in /cxf/branches/2.3.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
Author: sergeyb
Date: Tue Feb 8 19:13:04 2011
New Revision: 1068530
URL: http://svn.apache.org/viewvc?rev=1068530&view=rev
Log:
Merged revisions 1068525 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1068525 | sergeyb | 2011-02-08 19:03:04 +0000 (Tue, 08 Feb 2011) | 1 line
[CXF-3021] Minor update to the AbstractJAXRSFactoryBean to avoid hidden loader exceptions in the absence of wsdl4j
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 19:13:04 2011
@@ -1 +1 @@
-/cxf/trunk:1068320,1068337
+/cxf/trunk:1068320,1068337,1068525
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java?rev=1068530&r1=1068529&r2=1068530&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java Tue Feb 8 19:13:04 2011
@@ -101,7 +101,7 @@ public class AbstractJAXRSFactoryBean ex
BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
try {
bfm.getBindingFactory(JAXRSBindingFactory.JAXRS_BINDING_ID);
- } catch (BusException b) {
+ } catch (Throwable b) {
//not registered, let's register one
bfm.registerBindingFactory(JAXRSBindingFactory.JAXRS_BINDING_ID,
new JAXRSBindingFactory(bus));