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 2012/01/02 20:27:05 UTC
svn commit: r1226526 - in /cxf/branches/2.4.x-fixes: ./
rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
Author: sergeyb
Date: Mon Jan 2 19:27:05 2012
New Revision: 1226526
URL: http://svn.apache.org/viewvc?rev=1226526&view=rev
Log:
Merged revisions 1226521 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1226521 | sergeyb | 2012-01-02 19:19:04 +0000 (Mon, 02 Jan 2012) | 1 line
Fixing the build failure
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 2 19:27:05 2012
@@ -1 +1 @@
-/cxf/trunk:1225217,1225494,1225521,1225538,1225563,1225876,1225880,1225895
+/cxf/trunk:1225217,1225494,1225521,1225538,1225563,1225876,1225880,1225895,1226521
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java?rev=1226526&r1=1226525&r2=1226526&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java Mon Jan 2 19:27:05 2012
@@ -897,7 +897,6 @@ public class ProviderFactoryTest extends
private static class AbstractTestExceptionMapper<T extends RuntimeException>
implements ExceptionMapper<T> {
- @Override
public Response toResponse(T arg0) {
// TODO Auto-generated method stub
return null;