CALL文でモジュール呼び出しに失敗したときの処理を修正した.

Author: ytr-sakamoto

libcobj/src/jp/osscons/opensourcecobol/libcobj/call/CobolResolve.java

@@ -190,38 +190,45 @@ static public CobolRunnable resolve(AbstractCobolField cobolField) throws CobolC
 	static public CobolRunnable resolve(String name) throws CobolCallException {
 		String fullName;
 		CobolRunnable runnable = null;
+		System.out.println("[dbg in lib] 0");
 
 		/* encode program name */
 		char c1 = name.charAt(0);
 		if(c1 >= '0' && c1 <= '9') {
 			name = "_" + name;
 		}
+		System.out.println("[dbg in lib] 1");
 		name = name.replaceAll("-", "__");
+		System.out.println("[dbg in lib] 2");
 
 		/* search the cache */
 		if(callTable.containsKey(name)) {
 			return callTable.get(name);
 		}
 
+		System.out.println("[dbg in lib] 3");
 		if(name_convert == 1) {
 			name = name.toLowerCase();
 		}else if(name_convert == 2) {
 			name = name.toUpperCase();
 		}
 
+		System.out.println("[dbg in lib] 4");
 		if(defaultPackageName != null) {
 			fullName = defaultPackageName + "." + name;
 		}else {
 			fullName = name;
 		}
 
+		System.out.println("[dbg in lib] 5");
 		/* search the main program */
 		runnable = getInstance(fullName);
 		if(runnable != null) {
 			callTable.put(name, runnable);
 			return runnable;
 		}
 
+		System.out.println("[dbg in lib] 6");
 		/* search external modules */
 		for (String package_path : package_paths) {
 			fullName = package_path + "." + name;
@@ -232,8 +239,9 @@ static public CobolRunnable resolve(String name) throws CobolCallException {
 			}
 		}
 
+		System.out.println("[dbg in lib] 7");
 		//Not found
-		throw CobolCallException.ex;
+		throw new CobolCallException();
 	}
 
 	/**
@@ -275,7 +283,7 @@ static private CobolRunnable getInstance(String name) {
 			}
 		} catch (ClassNotFoundException  e) {
 			//TODO
-			e.printStackTrace();
+			//e.printStackTrace();
 			//Continue
 		}
 

libcobj/src/jp/osscons/opensourcecobol/libcobj/exceptions/CobolCallException.java

@@ -26,10 +26,6 @@ public class CobolCallException extends Exception {
 
 	public static CobolCallException ex;
 
-	{
-		ex = new CobolCallException();
-	}
-
 	/**
 	 * コンストラクタ
 	 */