cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1470446 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
Date Mon, 22 Apr 2013 10:55:04 GMT
Author: ay
Date: Mon Apr 22 10:55:04 2013
New Revision: 1470446

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

........
  r1470444 | ay | 2013-04-22 12:53:08 +0200 (Mon, 22 Apr 2013) | 1 line
  
  fix a typo bug in CXF-4950
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.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/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java?rev=1470446&r1=1470445&r2=1470446&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
Mon Apr 22 10:55:04 2013
@@ -620,8 +620,8 @@ public final class JAXRSUtils {
                                                     List<MediaType> acceptTypes) {
         List<MediaType> actualMts1 = intersectSortMediaTypes(mts1, acceptTypes, true);
         List<MediaType> actualMts2 = intersectSortMediaTypes(mts2, acceptTypes, true);
-        int size1 = mts1.size();
-        int size2 = mts2.size();
+        int size1 = actualMts1.size();
+        int size2 = actualMts2.size();
         for (int i = 0; i < size1 && i < size2; i++) {
             int result = compareMediaTypes(actualMts1.get(i), actualMts2.get(i), null);
             if (result == 0) {



Mime
View raw message