Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9752 from nwk37011/classvaluecompat
ClassValueCompat to support systems without java.lang.ClassValue
- Loading branch information
Showing
7 changed files
with
112 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
/* | ||
* Scala (https://www.scala-lang.org) | ||
* | ||
* Copyright EPFL and Lightbend, Inc. | ||
* | ||
* Licensed under Apache License 2.0 | ||
* (http://www.apache.org/licenses/LICENSE-2.0). | ||
* | ||
* See the NOTICE file distributed with this work for | ||
* additional information regarding copyright ownership. | ||
*/ | ||
|
||
package scala.runtime | ||
|
||
|
||
import scala.runtime.ClassValueCompat._ | ||
|
||
private[scala] abstract class ClassValueCompat[T] extends ClassValueInterface[T] { self => | ||
private val instance: ClassValueInterface[T] = | ||
if (classValueAvailable) new JavaClassValue() | ||
else new FallbackClassValue() | ||
|
||
private class JavaClassValue extends ClassValue[T] with ClassValueInterface[T] { | ||
override def computeValue(cls: Class[_]): T = self.computeValue(cls) | ||
} | ||
|
||
private class FallbackClassValue extends ClassValueInterface[T] { | ||
override def get(cls: Class[_]): T = self.computeValue(cls) | ||
|
||
override def remove(cls: Class[_]): Unit = {} | ||
} | ||
|
||
def get(cls: Class[_]): T = instance.get(cls) | ||
|
||
def remove(cls: Class[_]): Unit = instance.remove(cls) | ||
|
||
protected def computeValue(cls: Class[_]): T | ||
} | ||
|
||
private[scala] object ClassValueCompat { | ||
trait ClassValueInterface[T] { | ||
def get(cls: Class[_]): T | ||
|
||
def remove(cls: Class[_]): Unit | ||
} | ||
|
||
private val classValueAvailable: Boolean = try { | ||
Class.forName("java.lang.ClassValue", false, classOf[Object].getClassLoader) | ||
true | ||
} catch { | ||
case _: ClassNotFoundException => false | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* | ||
* Scala (https://www.scala-lang.org) | ||
* | ||
* Copyright EPFL and Lightbend, Inc. | ||
* | ||
* Licensed under Apache License 2.0 | ||
* (http://www.apache.org/licenses/LICENSE-2.0). | ||
* | ||
* See the NOTICE file distributed with this work for | ||
* additional information regarding copyright ownership. | ||
*/ | ||
|
||
package scala.runtime | ||
|
||
import java.io.Serializable | ||
import java.security.PrivilegedActionException | ||
import java.security.PrivilegedExceptionAction | ||
|
||
private[runtime] object ModuleSerializationProxy { | ||
private val instances = new ClassValueCompat[Object] { | ||
override protected def computeValue(cls: Class[_]): Object = { | ||
try { | ||
java.security.AccessController.doPrivileged((() => cls.getField("MODULE$").get(null)): PrivilegedExceptionAction[Object]) | ||
} catch { | ||
case e: PrivilegedActionException => | ||
rethrowRuntime(e.getCause) | ||
} | ||
} | ||
} | ||
|
||
private def rethrowRuntime(e: Throwable): Object = { | ||
val cause = e.getCause | ||
cause match { | ||
case exception: RuntimeException => throw exception | ||
case _ => throw new RuntimeException(cause) | ||
} | ||
} | ||
} | ||
|
||
@SerialVersionUID(1L) | ||
final class ModuleSerializationProxy(moduleClass: Class[_]) extends Serializable { | ||
private def readResolve = ModuleSerializationProxy.instances.get(moduleClass) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters