=================================================================== RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v retrieving revision 1.17 retrieving revision 1.20 diff -u -p -r1.17 -r1.20 --- OpenXM/src/OpenMath/OMproxy.java 2000/01/18 07:59:19 1.17 +++ OpenXM/src/OpenMath/OMproxy.java 2000/01/19 15:19:29 1.20 @@ -1,5 +1,5 @@ /** - * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.16 2000/01/13 12:35:56 tam Exp $ + * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.19 2000/01/19 09:35:06 tam Exp $ */ import JP.ac.kobe_u.math.tam.OpenXM.*; @@ -10,7 +10,7 @@ class OMproxy implements Runnable{ private OpenXM ox; private Stack stack = new Stack(); private boolean debug = true; - final int version = 199911110; + final int version = 200001190; public OMproxy(String host,int ControlPort,int DataPort) throws IOException{ ox = new OpenXM(this,host,ControlPort,DataPort); @@ -20,8 +20,8 @@ class OMproxy implements Runnable{ OM2OXM P = new OM2OXM(); debug("OMproxy started."); - try{ - while(true){ + while(true){ + try{ int ox_tag = ox.receiveOXtag(); switch(ox_tag){ @@ -34,10 +34,11 @@ class OMproxy implements Runnable{ debug("push: "+ stack.peek()); break; } + }catch(Exception e){ + System.err.println(e.getMessage()); + e.printStackTrace(); + debug("error occured. stack was cleared."); } - }catch(java.io.IOException e){ - System.err.println(e.getMessage()); - e.printStackTrace(); } System.out.println("breaking..."); @@ -113,6 +114,7 @@ class OMproxy implements Runnable{ CMO[] list = {new CMO_INT32(SM.SM_popCMO), new CMO_INT32(SM.SM_executeFunction), new CMO_INT32(SM.SM_mathcap), + new CMO_INT32(SM.SM_setMathCap), new CMO_INT32(SM.SM_control_kill), new CMO_INT32(SM.SM_control_reset_connection)}; mathcap[1] = new CMO_LIST(list); @@ -226,8 +228,6 @@ class OMproxy implements Runnable{ return ret; } - private static native void setNoInterrupt(); - public static void main(String argv[]){ String host = "localhost"; int DataPort = 1300, ControlPort = 1200; @@ -243,9 +243,6 @@ class OMproxy implements Runnable{ }else if(argv[i].equals("-control")){ ControlPort = Integer.valueOf(argv[++i]).intValue(); }else if(argv[i].equals("-insecure")){ - }else if(argv[i].equals("-nohup")){ - System.loadLibrary("native"); - setNoInterrupt(); }else{ System.err.println("unknown option : "+ argv[i]); System.err.print(usage());