Merge pull request scala#7913 from retronym/topic/lambda-deserializer…

…-null

Add library support for future fix for scala/bug#11345

src/library/scala/runtime/LambdaDeserializer.scala

@@ -44,6 +44,13 @@ object LambdaDeserializer {
    */
   def deserializeLambda(lookup: MethodHandles.Lookup, cache: java.util.Map[String, MethodHandle],
                         targetMethodMap: java.util.Map[String, MethodHandle], serialized: SerializedLambda): AnyRef = {
+    val result = deserializeLambdaOrNull(lookup, cache, targetMethodMap, serialized)
+    if (result == null) throw new IllegalArgumentException("Illegal lambda deserialization")
+    else result
+  }
+
+  def deserializeLambdaOrNull(lookup: MethodHandles.Lookup, cache: java.util.Map[String, MethodHandle],
+                              targetMethodMap: java.util.Map[String, MethodHandle], serialized: SerializedLambda): AnyRef = {
     assert(targetMethodMap != null)
     def slashDot(name: String) = name.replaceAll("/", ".")
     val loader = lookup.lookupClass().getClassLoader
@@ -85,7 +92,7 @@ object LambdaDeserializer {
       val implMethod: MethodHandle = if (targetMethodMap.containsKey(key)) {
         targetMethodMap.get(key)
       } else {
-        throw new IllegalArgumentException("Illegal lambda deserialization")
+        return null
       }
 
       val flags: Int = LambdaMetafactory.FLAG_SERIALIZABLE
@@ -101,11 +108,14 @@ object LambdaDeserializer {
     }
 
     val factory: MethodHandle = if (cache == null) {
-      makeCallSite.getTarget
+      val callSite = makeCallSite
+      if (callSite == null) return null
+      callSite.getTarget
     } else cache.synchronized{
       cache.get(key) match {
         case null =>
           val callSite = makeCallSite
+          if (callSite == null) return null
           val temp = callSite.getTarget
           cache.put(key, temp)
           temp