Skip to content

Commit 2e7a3d7

Browse files
committed
Merge pull request scala#5042 from soc/SI-9539
SI-9539 Specify charset when reading ScalaSignatures, ...
2 parents fa3ba5a + 1133991 commit 2e7a3d7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/reflect/scala/reflect/runtime/JavaMirrors.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ private[scala] trait JavaMirrors extends internal.SymbolTable with api.JavaUnive
613613
loadBytes[String]("scala.reflect.ScalaSignature") match {
614614
case Some(ssig) =>
615615
info(s"unpickling Scala $clazz and $module, owner = ${clazz.owner}")
616-
val bytes = ssig.getBytes
616+
val bytes = ssig.getBytes(java.nio.charset.StandardCharsets.UTF_8)
617617
val len = ByteCodecs.decode(bytes)
618618
assignAssociatedFile(clazz, module, jclazz)
619619
unpickler.unpickle(bytes take len, 0, clazz, module, jclazz.getName)
@@ -622,7 +622,7 @@ private[scala] trait JavaMirrors extends internal.SymbolTable with api.JavaUnive
622622
loadBytes[Array[String]]("scala.reflect.ScalaLongSignature") match {
623623
case Some(slsig) =>
624624
info(s"unpickling Scala $clazz and $module with long Scala signature")
625-
val encoded = slsig flatMap (_.getBytes)
625+
val encoded = slsig flatMap (_.getBytes(java.nio.charset.StandardCharsets.UTF_8))
626626
val len = ByteCodecs.decode(encoded)
627627
val decoded = encoded.take(len)
628628
assignAssociatedFile(clazz, module, jclazz)

0 commit comments

Comments
 (0)