From c7323486233ab79ebf0d5066faa35443798e78b5 Mon Sep 17 00:00:00 2001 From: Mathias Date: Tue, 3 Nov 2015 10:40:52 +0100 Subject: [PATCH] =htp #18389 revert earlier workaround since original problem in spray-json has been fixed --- .../http/scaladsl/marshallers/sprayjson/SprayJsonSupport.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akka-http-marshallers-scala/akka-http-spray-json/src/main/scala/akka/http/scaladsl/marshallers/sprayjson/SprayJsonSupport.scala b/akka-http-marshallers-scala/akka-http-spray-json/src/main/scala/akka/http/scaladsl/marshallers/sprayjson/SprayJsonSupport.scala index 6d10f5f8ab..57ac42d3e8 100644 --- a/akka-http-marshallers-scala/akka-http-spray-json/src/main/scala/akka/http/scaladsl/marshallers/sprayjson/SprayJsonSupport.scala +++ b/akka-http-marshallers-scala/akka-http-spray-json/src/main/scala/akka/http/scaladsl/marshallers/sprayjson/SprayJsonSupport.scala @@ -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) }