No commit message

janino-compiler · Dec 16, 2019 · 64fd1f5 · 64fd1f5
1 parent 43ee20e
commit 64fd1f5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/commons-compiler/src/main/java/org/codehaus/commons/compiler/samples/ExpressionDemo.java b/commons-compiler/src/main/java/org/codehaus/commons/compiler/samples/ExpressionDemo.java
@@ -44,7 +44,7 @@ class ExpressionDemo extends DemoBase {
         String[]   parameterNames         = {};
         Class<?>[] parameterTypes         = {};
         Class<?>[] thrownExceptions       = {};
-        String[]   optionalDefaultImports = null;
+        String[]   defaultImports         = new String[0];
 
         int i;
         for (i = 0; i < args.length; ++i) {
@@ -63,7 +63,7 @@ class ExpressionDemo extends DemoBase {
                 thrownExceptions = DemoBase.stringToTypes(args[++i]);
             } else
             if ("-di".equals(arg)) {
-                optionalDefaultImports = DemoBase.explode(args[++i]);
+                defaultImports = DemoBase.explode(args[++i]);
             } else
             if ("-help".equals(arg)) {
                 System.err.println("Usage:");
@@ -123,7 +123,7 @@ class ExpressionDemo extends DemoBase {
         // Create "ExpressionEvaluator" object.
         IExpressionEvaluator ee = CompilerFactoryFactory.getDefaultCompilerFactory().newExpressionEvaluator();
         if (optionalExpressionType != null) ee.setExpressionType(optionalExpressionType);
-        ee.setDefaultImports(optionalDefaultImports);
+        ee.setDefaultImports(defaultImports);
         ee.setParameters(parameterNames, parameterTypes);
         ee.setThrownExceptions(thrownExceptions);
         ee.cook(expression);

diff --git a/commons-compiler/src/main/java/org/codehaus/commons/compiler/samples/ScriptDemo.java b/commons-compiler/src/main/java/org/codehaus/commons/compiler/samples/ScriptDemo.java
@@ -40,11 +40,11 @@ class ScriptDemo extends DemoBase {
     public static void
     main(String[] args) throws Exception {
 
-        Class<?>   returnType             = void.class;
-        String[]   parameterNames         = {};
-        Class<?>[] parameterTypes         = {};
-        Class<?>[] thrownExceptions       = {};
-        String[]   optionalDefaultImports = null;
+        Class<?>   returnType       = void.class;
+        String[]   parameterNames   = {};
+        Class<?>[] parameterTypes   = {};
+        Class<?>[] thrownExceptions = {};
+        String[]   defaultImports   = {};
 
         int i;
         for (i = 0; i < args.length; ++i) {
@@ -63,7 +63,7 @@ class ScriptDemo extends DemoBase {
                 thrownExceptions = DemoBase.stringToTypes(args[++i]);
             } else
             if ("-di".equals(arg)) {
-                optionalDefaultImports = DemoBase.explode(args[++i]);
+                defaultImports = DemoBase.explode(args[++i]);
             } else
            if ("-help".equals(arg)) {
                System.err.println("Usage:");
@@ -110,7 +110,7 @@ class ScriptDemo extends DemoBase {
         // Create "ScriptEvaluator" object.
         IScriptEvaluator se = CompilerFactoryFactory.getDefaultCompilerFactory().newScriptEvaluator();
         se.setReturnType(returnType);
-        se.setDefaultImports(optionalDefaultImports);
+        se.setDefaultImports(defaultImports);
         se.setParameters(parameterNames, parameterTypes);
         se.setThrownExceptions(thrownExceptions);
         se.cook(script);