raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge pull request #18836 from spray/wip-revert-spray-json-utf8-workaround

Browse source 
=htp #18389 revert earlier workaround since original problem in spray-json has been fixed
This commit is contained in:
Konrad Malawski 2015-11-03 14:32:53 +01:00
commit 2b8763dd7b
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-http-marshallers-scala/akka-http-spray-json/src/main/scala/akka/http/scaladsl/marshallers/sprayjson/SprayJsonSupport.scala
View file

@ -23,7 +23,7 @@ trait SprayJsonSupport {
implicit def sprayJsValueUnmarshaller: FromEntityUnmarshaller[JsValue] =
Unmarshaller.byteStringUnmarshaller.forContentTypes(`application/json`).mapWithCharset { (data, charset) ⇒
val input =
if (charset == HttpCharsets.`UTF-8`) ParserInput(data.utf8String)
if (charset == HttpCharsets.`UTF-8`) ParserInput(data.toArray)
else ParserInput(data.decodeString(charset.nioCharset.name)) // FIXME: identify charset by instance, not by name!
JsonParser(input)
}