cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1513433 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
Date Tue, 13 Aug 2013 10:50:43 GMT
Author: ay
Date: Tue Aug 13 10:50:43 2013
New Revision: 1513433

URL: http://svn.apache.org/r1513433
Log:
Merged revisions 1513429 via  svn merge from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1513429 | ay | 2013-08-13 12:45:30 +0200 (Tue, 13 Aug 2013) | 1 line
  
  make jaxrs SelectMethodCandaitesTest deterministic to prevent sporadic test errors
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java

Propchange: cxf/branches/2.7.x-fixes/
            ('svn:mergeinfo' removed)

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

Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java?rev=1513433&r1=1513432&r2=1513433&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
Tue Aug 13 10:50:43 2013
@@ -547,7 +547,7 @@ public class SelectMethodCandidatesTest 
                      ori.getMethodToInvoke().getName());
         
         
-        acceptContentTypes = "application/xml,application/json";
+        acceptContentTypes = "application/xml,application/json;q=0.8";
         resource = JAXRSUtils.selectResourceClass(resources, "/1/2/3/d/1", values,
                                                   new MessageImpl());
         ori = JAXRSUtils.findTargetMethod(resource, 



Mime
View raw message