svn commit: r980248 - in /cxf/branches/2.2.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java

[sergeyb]

Author: sergeyb
Date: Wed Jul 28 22:04:19 2010
New Revision: 980248

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

........
  r980246 | sergeyb | 2010-07-28 23:02:46 +0100 (Wed, 28 Jul 2010) | 1 line
  
  Fixing JDK 1.5 compilation issue
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 28 22:04:19 2010
@@ -1 +1 @@
-/cxf/trunk:979457,979459,979764,980236
+/cxf/trunk:979457,979459,979764,980236,980246

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

Modified: 
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java?rev=980248&r1=980247&r2=980248&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
 Wed Jul 28 22:04:19 2010
@@ -221,7 +221,6 @@ public class RequestImpl implements Requ
 
     private static class VariantComparator implements Comparator<Variant> {
 
-        @Override
         public int compare(Variant v1, Variant v2) {
             int result = compareMediaTypes(v1.getMediaType(), 
v2.getMediaType());