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 2010/11/11 20:16:57 UTC
svn commit: r1034056 - in /cxf/branches/2.2.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
Author: sergeyb
Date: Thu Nov 11 19:16:56 2010
New Revision: 1034056
URL: http://svn.apache.org/viewvc?rev=1034056&view=rev
Log:
Merged revisions 1034055 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes
................
r1034055 | sergeyb | 2010-11-11 19:15:17 +0000 (Thu, 11 Nov 2010) | 9 lines
Merged revisions 1034052 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1034052 | sergeyb | 2010-11-11 19:12:56 +0000 (Thu, 11 Nov 2010) | 1 line
JAX-RS : Fixing a catch statement
........
................
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 11 19:16:56 2010
@@ -1,2 +1,2 @@
-/cxf/branches/2.3.x-fixes:1027513,1027608,1030055,1030193,1034045
-/cxf/trunk:1027509,1027599,1030053,1030189,1034035
+/cxf/branches/2.3.x-fixes:1027513,1027608,1030055,1030193,1034045,1034055
+/cxf/trunk:1027509,1027599,1030053,1030189,1034035,1034052
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java?rev=1034056&r1=1034055&r2=1034056&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java Thu Nov 11 19:16:56 2010
@@ -86,7 +86,7 @@ public final class AnnotationUtils {
classes.add(HttpServletResponse.class);
classes.add(ServletConfig.class);
classes.add(ServletContext.class);
- } catch (Exception ex) {
+ } catch (Throwable ex) {
// it is not a problem on the client side and the exception will be
// thrown later on if the injection of one of these contexts will be
// attempted on the server side