cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1225572 - in /cxf/branches/2.4.x-fixes: ./ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/FormatResponseHandler.java
Date Thu, 29 Dec 2011 15:46:07 GMT
Author: sergeyb
Date: Thu Dec 29 15:46:07 2011
New Revision: 1225572

URL: http://svn.apache.org/viewvc?rev=1225572&view=rev
Log:
Merged revisions 1225563 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1225563 | sergeyb | 2011-12-29 15:38:56 +0000 (Thu, 29 Dec 2011) | 1 line
  
  Fixing the compilation failure
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/FormatResponseHandler.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 29 15:46:07 2011
@@ -1 +1 @@
-/cxf/trunk:1225217,1225494,1225521,1225538
+/cxf/trunk:1225217,1225494,1225521,1225538,1225563

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

Modified: cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/FormatResponseHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/FormatResponseHandler.java?rev=1225572&r1=1225571&r2=1225572&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/FormatResponseHandler.java
(original)
+++ cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/FormatResponseHandler.java
Thu Dec 29 15:46:07 2011
@@ -31,7 +31,6 @@ public class FormatResponseHandler imple
     @Context
     private MessageContext mc;
     
-    @Override
     public Response handleResponse(Message m, OperationResourceInfo ori, Response response)
{
         if (mc.getUriInfo().getQueryParameters().containsKey("_format")) {
             mc.put(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);



Mime
View raw message