Author: shawkins Date: 2009-12-10 10:41:06 -0500 (Thu, 10 Dec 2009) New Revision: 1637 Modified: trunk/adminshell/src/main/java/bsh/Interpreter.java trunk/adminshell/src/main/resources/scripts/jdbc.bsh Log: TEIID-890 reapplying changes to prevent printstacktrace and changing maxrows default to 0 (unlimited) Modified: trunk/adminshell/src/main/java/bsh/Interpreter.java =================================================================== --- trunk/adminshell/src/main/java/bsh/Interpreter.java 2009-12-10 15:31:08 UTC (rev 1636) +++ trunk/adminshell/src/main/java/bsh/Interpreter.java 2009-12-10 15:41:06 UTC (rev 1637) @@ -89,6 +89,8 @@ <p> See the BeanShell User's Manual for more information. + + PrintStackTrace were removed from run method, from original version. */ public class Interpreter implements Runnable, ConsoleInterface,Serializable @@ -493,14 +495,16 @@ catch(InterpreterError e) { error("Internal Error: " + e.getMessage()); - e.printStackTrace(); + if ( DEBUG ) { + e.printStackTrace(); + } if(!interactive) eof = true; } catch(TargetError e) { error("// Uncaught Exception: " + e ); - if ( e.inNativeCode() ) + if ( DEBUG && e.inNativeCode() ) e.printStackTrace( DEBUG, err ); if(!interactive) eof = true; Modified: trunk/adminshell/src/main/resources/scripts/jdbc.bsh =================================================================== --- trunk/adminshell/src/main/resources/scripts/jdbc.bsh 2009-12-10 15:31:08 UTC (rev 1636) +++ trunk/adminshell/src/main/resources/scripts/jdbc.bsh 2009-12-10 15:41:06 UTC (rev 1637) @@ -182,7 +182,7 @@ int FETCHSIZE=1000; -int MAXROWS=500; +int MAXROWS=0; private void setParameters(Object[] params) { if (params != null && params.length > 0) {