Try always specifying classloader

cb372 · Mar 14, 2015 · 42f432e · 42f432e
1 parent b5fc1a5
commit 42f432e
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/redis/src/main/scala/scalacache/redis/RedisSerialization.scala b/redis/src/main/scala/scalacache/redis/RedisSerialization.scala
@@ -61,10 +61,8 @@ trait RedisSerialization {
     result.asInstanceOf[A]
   }
 
-  private def createObjectInputStream(inputStream: InputStream): ObjectInputStream = customClassloader match {
-    case Some(classloader) => new ClassLoaderOIS(inputStream, classloader)
-    case None => new ObjectInputStream(inputStream)
-  }
+  private def createObjectInputStream(inputStream: InputStream): ObjectInputStream =
+    new ClassLoaderOIS(inputStream, customClassloader getOrElse getClass.getClassLoader)
 
 }