Author: sergeyb
Date: Fri Jul 9 20:45:27 2010
New Revision: 962690
URL: http://svn.apache.org/viewvc?rev=962690&view=rev
Log:
Merged revisions 959793 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r959793 | gmazza | 2010-07-01 22:52:30 +0100 (Thu, 01 Jul 2010) | 2 lines
typo fixed.
........
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/MediaTypeHeaderProvider.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 9 20:45:27 2010
@@ -1 +1 @@
-/cxf/trunk:959789,960506,961051,961818
+/cxf/trunk:959789,959793,960506,961051,961818
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/MediaTypeHeaderProvider.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java?rev=962690&r1=962689&r2=962690&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
Fri Jul 9 20:45:27 2010
@@ -84,7 +84,7 @@ public class MediaTypeHeaderProvider imp
private static void addParameter(Map<String, String> parameters, String
token) {
int equalSign = token.indexOf('=');
if (equalSign == -1) {
- throw new IllegalArgumentException("Wrong media type parameter,
seperator is missing");
+ throw new IllegalArgumentException("Wrong media type parameter,
separator is missing");
}
parameters.put(token.substring(0, equalSign).trim().toLowerCase(),
token.substring(equalSign + 1).trim());