From cb2e003a859dce7c091e74a1ebb90b344b237d62 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Thu, 2 Nov 2017 13:40:14 +0100 Subject: [PATCH] Avoid javax.xml in SerializeSpec (#23903) (#23905) Neater anyway, and would become problematic with jdk9 --- .../src/test/scala/akka/serialization/SerializeSpec.scala | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala index 6d00e9a85e..41a0a2ae34 100644 --- a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala @@ -14,10 +14,9 @@ import akka.util.Timeout import scala.concurrent.duration._ import com.typesafe.config._ import akka.pattern.ask -import org.apache.commons.codec.binary.Hex.encodeHex +import org.apache.commons.codec.binary.Hex.decodeHex import java.nio.ByteOrder import java.nio.ByteBuffer -import akka.actor.NoSerializationVerificationNeeded import test.akka.serialization.NoVerification object SerializationTests { @@ -351,7 +350,7 @@ class SerializationCompatibilitySpec extends AkkaSpec(SerializationTests.mostlyR "Cross-version serialization compatibility" must { def verify(obj: SystemMessage, asExpected: String): Unit = { - val bytes = javax.xml.bind.DatatypeConverter.parseHexBinary(asExpected) + val bytes = decodeHex(asExpected.toCharArray) val stream = new ObjectInputStream(new ByteArrayInputStream(bytes)) val read = stream.readObject() read should ===(obj)