diff src/luan/LuanJavaFunction.java @ 86:6db8f286fa6c

_ENV is per module, not global git-svn-id: https://luan-java.googlecode.com/svn/trunk@87 21e917c8-12df-6dd8-5cb6-c86387c605b9
author fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
date Wed, 27 Feb 2013 08:03:51 +0000
parents aeedefd3e3f3
children 6ca02b188dba
line wrap: on
line diff
--- a/src/luan/LuanJavaFunction.java	Mon Feb 25 03:53:54 2013 +0000
+++ b/src/luan/LuanJavaFunction.java	Wed Feb 27 08:03:51 2013 +0000
@@ -146,7 +146,7 @@
 
 	private static final RtnConverter RTN_EMPTY = new RtnConverter() {
 		public Object[] convert(Object obj) {
-			return EMPTY_RTN;
+			return EMPTY;
 		}
 	};
 
@@ -331,6 +331,8 @@
 
 	private static final ArgConverter ARG_TABLE = new ArgConverter() {
 		public Object convert(Object obj) {
+			if( obj == null )
+				return null;
 			if( obj instanceof List ) {
 				@SuppressWarnings("unchecked")
 				List<Object> list = (List<Object>)obj;