raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

added NOOP serializer + fixed wrong servlet name in web.xml

Browse source
This commit is contained in:
jboner 2009-10-14 22:18:41 +02:00
parent 2baa653024
commit 3da2d61787
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
akka-actors/src/main/scala/serialization/Serializer.scala
View file

@ -37,6 +37,12 @@ object Serializer {
val EMPTY_CLASS_ARRAY = Array[Class[_]]()
val EMPTY_ANY_REF_ARRAY = Array[AnyRef]()
object NOOP extends Serializer {
def deepClone(obj: AnyRef): AnyRef = obj
def out(obj: AnyRef): Array[Byte] = obj.asInstanceOf[Array[Byte]]
def in(bytes: Array[Byte], clazz: Option[Class[_]]): AnyRef = bytes
}
/**
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/

3
akka-persistence/src/main/scala/CassandraStorage.scala
View file

@ -46,11 +46,12 @@ object CassandraStorage extends MapStorage
*/
private[this] val serializer: Serializer = {
config.getString("akka.storage.cassandra.storage-format", "java") match {
config.getString("akka.storage.cassandra.storage-format", "manual") match {
case "scala-json" => Serializer.ScalaJSON
case "java-json" => Serializer.JavaJSON
case "protobuf" => Serializer.Protobuf
case "java" => Serializer.Java
case "manual" => Serializer.NOOP
case "sbinary" => throw new UnsupportedOperationException("SBinary serialization protocol is not yet supported for storage")
case "avro" => throw new UnsupportedOperationException("Avro serialization protocol is not yet supported for storage")
case unknown => throw new UnsupportedOperationException("Unknown storage serialization protocol [" + unknown + "]")

2
akka-samples-lift/src/main/webapp/WEB-INF/web.xml
View file

@ -13,7 +13,7 @@
</filter-mapping>
<servlet>
<servlet-name>AkkaServlet</servlet-name>
<servlet-class>se.scalablesolutions.akka.kernel.rest.AkkaServlet</servlet-class>
<servlet-class>se.scalablesolutions.akka.rest.AkkaServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>AkkaServlet</servlet-name>