You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2013/09/15 19:24:05 UTC

svn commit: r1523464 - in /lucene/dev/trunk/lucene/expressions/src: java/org/apache/lucene/expressions/js/JavascriptCompiler.java test/org/apache/lucene/expressions/js/TestCustomFunctions.java

Author: uschindler
Date: Sun Sep 15 17:24:05 2013
New Revision: 1523464

URL: http://svn.apache.org/r1523464
Log:
LUCENE-5207: Fix a bug in the test and add final to the classloader

Modified:
    lucene/dev/trunk/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptCompiler.java
    lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestCustomFunctions.java

Modified: lucene/dev/trunk/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptCompiler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptCompiler.java?rev=1523464&r1=1523463&r2=1523464&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptCompiler.java (original)
+++ lucene/dev/trunk/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptCompiler.java Sun Sep 15 17:24:05 2013
@@ -73,7 +73,7 @@ import org.objectweb.asm.commons.Generat
  */
 public class JavascriptCompiler {
 
-  static class Loader extends ClassLoader {
+  static final class Loader extends ClassLoader {
     Loader(ClassLoader parent) {
       super(parent);
     }

Modified: lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestCustomFunctions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestCustomFunctions.java?rev=1523464&r1=1523463&r2=1523464&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestCustomFunctions.java (original)
+++ lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestCustomFunctions.java Sun Sep 15 17:24:05 2013
@@ -163,7 +163,7 @@ public class TestCustomFunctions extends
   }
   
   /** Classloader that can be used to create a fake static class that has one method returning a static var */
-  static class Loader extends ClassLoader implements Opcodes {
+  static final class Loader extends ClassLoader implements Opcodes {
     Loader(ClassLoader parent) {
       super(parent);
     }
@@ -227,7 +227,7 @@ public class TestCustomFunctions extends
     
     // use our classloader, not the foreign one, which should fail!
     try {
-      JavascriptCompiler.compile("bar()", functions, thisLoader);
+      JavascriptCompiler.compile("bar()", mixedFunctions, thisLoader);
       fail();
     } catch (IllegalArgumentException e) {
       assertTrue(e.getMessage().contains("is not declared by a class which is accessible by the given parent ClassLoader"));