Support for akka 2.2.1

chill-akka/src/main/scala/com/twitter/chill/akka/ActorRefSerializer.scala

@@ -47,9 +47,6 @@ class ActorRefSerializer(system: ExtendedActorSystem) extends Serializer[ActorRe
 	}
 
 	override def write(kryo: Kryo, output: Output, obj: ActorRef) = {
-		Serialization.currentTransportAddress.value match {
-			case null => output.writeString(obj.path.toString)
-			case addr => output.writeString(obj.path.toStringWithAddress(addr))
-		}
+    output.writeString(Serialization.serializedActorPath(obj))
 	}
 }

chill-akka/src/test/scala/com/twitter/chill/akka/AkkaTests.scala

@@ -46,5 +46,23 @@ class AkkaTests extends Specification {
       val serializer = serialization.findSerializerFor((1,2,3))
       serializer.getClass.equals(classOf[AkkaSerializer]) must beTrue
     }
+
+    "be selected for ActorRef" in {
+      val serializer = serialization.findSerializerFor(system.actorFor("akka://test-system/test-actor"))
+      serializer.getClass.equals(classOf[AkkaSerializer]) must beTrue
+    }
+
+    "serialize and deserialize ActorRef successfully" in {
+      val actorRef = system.actorFor("akka://test-system/test-actor")
+
+      val serialized = serialization.serialize(actorRef)
+      serialized.isSuccess must beTrue
+
+      val deserialized = serialization.deserialize(serialized.get, classOf[ActorRef])
+      deserialized.isSuccess must beTrue
+
+      deserialized.get.equals(actorRef) must beTrue
+    }
+
   }
 }

project/Build.scala

@@ -140,7 +140,7 @@ object ChillBuild extends Build {
       case false => Seq()
       case true => Seq(
       "com.typesafe" % "config" % "0.3.1",
-      "com.typesafe.akka" %% "akka-actor" % "2.1.4"
+      "com.typesafe.akka" %% "akka-actor" % "2.2.1"
     )
   }
   lazy val chillAkka = module("akka").settings(