diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2016-05-05 23:11:37 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2016-05-05 23:11:37 +1000 |
commit | 2e7a3d79eed4b7f8712ca8f297517063c13d2a28 (patch) | |
tree | e9d87c725b810c06c2989e3829401e6029383284 | |
parent | fa3ba5a55408af117b39e0872b5e734b017bbb59 (diff) | |
parent | 1133991ac812f6c5892c80bc2f8d843d6bb64b4b (diff) | |
download | scala-2e7a3d79eed4b7f8712ca8f297517063c13d2a28.tar.gz scala-2e7a3d79eed4b7f8712ca8f297517063c13d2a28.tar.bz2 scala-2e7a3d79eed4b7f8712ca8f297517063c13d2a28.zip |
Merge pull request #5042 from soc/SI-9539
SI-9539 Specify charset when reading ScalaSignatures, ...
-rw-r--r-- | src/reflect/scala/reflect/runtime/JavaMirrors.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/reflect/scala/reflect/runtime/JavaMirrors.scala b/src/reflect/scala/reflect/runtime/JavaMirrors.scala index 37b07ce775..9b0d66f41c 100644 --- a/src/reflect/scala/reflect/runtime/JavaMirrors.scala +++ b/src/reflect/scala/reflect/runtime/JavaMirrors.scala @@ -613,7 +613,7 @@ private[scala] trait JavaMirrors extends internal.SymbolTable with api.JavaUnive loadBytes[String]("scala.reflect.ScalaSignature") match { case Some(ssig) => info(s"unpickling Scala $clazz and $module, owner = ${clazz.owner}") - val bytes = ssig.getBytes + val bytes = ssig.getBytes(java.nio.charset.StandardCharsets.UTF_8) val len = ByteCodecs.decode(bytes) assignAssociatedFile(clazz, module, jclazz) unpickler.unpickle(bytes take len, 0, clazz, module, jclazz.getName) @@ -622,7 +622,7 @@ private[scala] trait JavaMirrors extends internal.SymbolTable with api.JavaUnive loadBytes[Array[String]]("scala.reflect.ScalaLongSignature") match { case Some(slsig) => info(s"unpickling Scala $clazz and $module with long Scala signature") - val encoded = slsig flatMap (_.getBytes) + val encoded = slsig flatMap (_.getBytes(java.nio.charset.StandardCharsets.UTF_8)) val len = ByteCodecs.decode(encoded) val decoded = encoded.take(len) assignAssociatedFile(clazz, module, jclazz) |