cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1331343 - in /cxf/branches/2.5.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
Date Fri, 27 Apr 2012 10:34:48 GMT
Author: sergeyb
Date: Fri Apr 27 10:34:47 2012
New Revision: 1331343

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

........
  r1331341 | sergeyb | 2012-04-27 11:25:14 +0100 (Fri, 27 Apr 2012) | 1 line
  
  Fixing the useless code in JAXRSInInterceptor
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1331341

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

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java?rev=1331343&r1=1331342&r2=1331343&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
Fri Apr 27 10:34:47 2012
@@ -134,7 +134,7 @@ public class JAXRSInInterceptor extends 
         }
         List<MediaType> acceptContentTypes = null;
         try {
-            JAXRSUtils.sortMediaTypes(acceptTypes);
+            acceptContentTypes = JAXRSUtils.sortMediaTypes(acceptTypes);
         } catch (IllegalArgumentException ex) {
             throw new WebApplicationException(406);
         }



Mime
View raw message