You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/09/14 21:40:21 UTC

svn commit: r1523301 - in /lucene/dev/branches/lucene5207/lucene/expressions/src: java/org/apache/lucene/expressions/js/JavascriptCompiler.java test/org/apache/lucene/expressions/js/TestCustomFunctions.java

Author: rmuir
Date: Sat Sep 14 19:40:20 2013
New Revision: 1523301

URL: http://svn.apache.org/r1523301
Log:
LUCENE-5207: check the class too

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

Modified: lucene/dev/branches/lucene5207/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptCompiler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5207/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptCompiler.java?rev=1523301&r1=1523300&r2=1523301&view=diff
==============================================================================
--- lucene/dev/branches/lucene5207/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptCompiler.java (original)
+++ lucene/dev/branches/lucene5207/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptCompiler.java Sat Sep 14 19:40:20 2013
@@ -715,6 +715,9 @@ public class JavascriptCompiler {
     if (!Modifier.isPublic(method.getModifiers())) {
       throw new IllegalArgumentException(method + " is not public.");
     }
+    if (!Modifier.isPublic(method.getDeclaringClass().getModifiers())) {
+      throw new IllegalArgumentException(method.getDeclaringClass().getName() + " is not public.");
+    }
     for (Class<?> clazz : method.getParameterTypes()) {
       if (!clazz.equals(double.class)) {
         throw new IllegalArgumentException(method + " must take only double parameters");

Modified: lucene/dev/branches/lucene5207/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestCustomFunctions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5207/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestCustomFunctions.java?rev=1523301&r1=1523300&r2=1523301&view=diff
==============================================================================
--- lucene/dev/branches/lucene5207/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestCustomFunctions.java (original)
+++ lucene/dev/branches/lucene5207/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestCustomFunctions.java Sat Sep 14 19:40:20 2013
@@ -141,4 +141,19 @@ public class TestCustomFunctions extends
       assertTrue(e.getMessage().contains("is not public"));
     }
   }
+  
+  static class NestedNotPublic {
+    public static double method() { return 0; }
+  }
+  
+  /** wrong class modifiers: class containing method is not public */
+  public void testWrongNestedNotPublic() throws Exception {
+    Map<String,Method> functions = new HashMap<String,Method>();
+    functions.put("foo", NestedNotPublic.class.getMethod("method"));
+    try {
+      JavascriptCompiler.compile("foo()", functions, getClass().getClassLoader());
+    } catch (IllegalArgumentException e) {
+      assertTrue(e.getMessage().contains("is not public"));
+    }
+  }
 }