You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2015/10/07 12:25:18 UTC
cxf git commit: Fixing empty charset processing errors,
patch from emlun applied with thanks
Repository: cxf
Updated Branches:
refs/heads/master 8bd6dd23e -> 59b87cad2
Fixing empty charset processing errors, patch from emlun applied with thanks
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/59b87cad
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/59b87cad
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/59b87cad
Branch: refs/heads/master
Commit: 59b87cad22c521fa2f4ec3e81812ba1629bd0041
Parents: 8bd6dd2
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Wed Oct 7 11:25:04 2015 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Wed Oct 7 11:25:04 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/cxf/helpers/HttpHeaderHelper.java | 3 +++
.../org/apache/cxf/helpers/HttpHeaderHelperTest.java | 13 +++++++++++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/59b87cad/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java b/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
index 52b1ebe..049691d 100644
--- a/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
+++ b/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
@@ -87,6 +87,9 @@ public final class HttpHeaderHelper {
if (charset.indexOf(";") != -1) {
charset = charset.substring(0, charset.indexOf(";")).trim();
}
+ if (charset.isEmpty()) {
+ return null;
+ }
if (charset.charAt(0) == '\"') {
charset = charset.substring(1, charset.length() - 1);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/59b87cad/core/src/test/java/org/apache/cxf/helpers/HttpHeaderHelperTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/helpers/HttpHeaderHelperTest.java b/core/src/test/java/org/apache/cxf/helpers/HttpHeaderHelperTest.java
index 6239fb4..7fdb41e 100644
--- a/core/src/test/java/org/apache/cxf/helpers/HttpHeaderHelperTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/HttpHeaderHelperTest.java
@@ -20,7 +20,9 @@
package org.apache.cxf.helpers;
import java.nio.charset.Charset;
+
import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
/**
@@ -39,5 +41,16 @@ public class HttpHeaderHelperTest {
cs = HttpHeaderHelper.mapCharset("'utf-8'");
assertEquals(Charset.forName("utf-8").name(), cs);
}
+
+ @Test
+ public void testEmptyCharset() {
+ String cs = HttpHeaderHelper.mapCharset(HttpHeaderHelper.findCharset("foo/bar; charset="));
+ assertEquals("ISO-8859-1", cs);
+ }
+ @Test
+ public void testEmptyCharset2() {
+ String cs = HttpHeaderHelper.mapCharset(HttpHeaderHelper.findCharset("foo/bar; charset=;"));
+ assertEquals("ISO-8859-1", cs);
+ }
}