Author: mduerig
Date: Fri Dec 10 13:26:44 2010
New Revision: 1044350
URL: http://svn.apache.org/viewvc?rev=1044350&view=rev
Log:
SLING-1892: Scala Scripting: Replace Class.forName uses by ClassLoader.loadClass
Modified:
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/Bindings.scala
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/ScalaInterpreter.scala
Modified:
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/Bindings.scala
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/Bindings.scala?rev=1044350&r1=1044349&r2=1044350&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/Bindings.scala
(original)
+++
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/Bindings.scala
Fri Dec 10 13:26:44 2010
@@ -70,7 +70,7 @@ trait Bindings extends Map[String, AnyRe
def accessible(clazz: Class[_]) = {
try {
- Class.forName(clazz.getName)
+ getClass.getClassLoader.loadClass(clazz.getName)
(clazz.getModifiers & 1) == 1
}
catch { case _ => false }
Modified:
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/ScalaInterpreter.scala
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/ScalaInterpreter.scala?rev=1044350&r1=1044349&r2=1044350&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/ScalaInterpreter.scala
(original)
+++
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/ScalaInterpreter.scala
Fri Dec 10 13:26:44 2010
@@ -281,7 +281,7 @@ class ScalaInterpreter(settings: Setting
def execute(name: String, bindings: Bindings, in: Option[InputStream], out:
Option[OutputStream]): Reporter = {
try {
val classLoader = new AbstractFileClassLoader(outputDir,
parentClassLoader)
- val script = Class.forName(name + "Runner", true, classLoader)
+ val script = classLoader.loadClass(name + "Runner")
val initMethod = (script
.getDeclaredMethods
.toList
