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:15:18 UTC
svn commit: r1034055 - in /cxf/branches/2.3.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
Author: sergeyb
Date: Thu Nov 11 19:15:17 2010
New Revision: 1034055
URL: http://svn.apache.org/viewvc?rev=1034055&view=rev
Log:
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.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 11 19:15:17 2010
@@ -1 +1 @@
-/cxf/trunk:1022599-1022884,1027274,1027462,1027509,1027553,1027599,1030053,1030189,1032296,1032833,1034035
+/cxf/trunk:1022599-1022884,1027274,1027462,1027509,1027553,1027599,1030053,1030189,1032296,1032833,1034035,1034052
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Nov 11 19:15:17 2010
@@ -1 +1 @@
-/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022599-1022884,1022911,1023068,1023121,1023597-1026352,1026549,1026551,1027244,1027269,1027274,1027462,1027509,1027553,1027599,1028170,1029943,1030053,1030189,1032296,1032833,1034035
+/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022599-1022884,1022911,1023068,1023121,1023597-1026352,1026549,1026551,1027244,1027269,1027274,1027462,1027509,1027553,1027599,1028170,1029943,1030053,1030189,1032296,1032833,1034035,1034052
Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java?rev=1034055&r1=1034054&r2=1034055&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java Thu Nov 11 19:15:17 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