[Jython-checkins] CVS: jython/com/ziclix/python/sql zxJDBC.java,1.4,1.5

[brian z. <bz...@us...>]

Update of /cvsroot/jython/jython/com/ziclix/python/sql
In directory usw-pr-cvs1:/tmp/cvs-serv20073/com/ziclix/python/sql

Modified Files:
	zxJDBC.java 
Log Message:
print the java stacktrace if requested

Index: zxJDBC.java
===================================================================
RCS file: /cvsroot/jython/jython/com/ziclix/python/sql/zxJDBC.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** zxJDBC.java	2001/12/14 04:18:54	1.4
--- zxJDBC.java	2002/01/11 04:22:15	1.5
***************
*** 300,318 ****
  	 * Return a newly instantiated Error.
  	 */
! 	public static PyException newError(Throwable e) {
  
! 		if (e instanceof PyException) {
! 			throw (PyException)e;
  		}
  
! 		try {
  			StringBuffer buffer = new StringBuffer();
  
! 			createExceptionMessage((SQLException)e, buffer, 0);
  
  			return newError(buffer.toString());
! 		} catch (ClassCastException ex) {}
! 
! 		return newError(e.getMessage());
  	}
  
--- 300,332 ----
  	 * Return a newly instantiated Error.
  	 */
! 	public static PyException newError(Throwable t) {
  
! 		if (Options.showJavaExceptions) {
! 			StdoutWrapper stderr = Py.stderr;
! 
! 			stderr.println("Java Traceback:");
! 
! 			java.io.CharArrayWriter buf = new java.io.CharArrayWriter();
! 
! 			if (t instanceof PyException) {
! 				((PyException)t).super__printStackTrace(new java.io.PrintWriter(buf));
! 			} else {
! 				t.printStackTrace(new java.io.PrintWriter(buf));
! 			}
! 
! 			stderr.print(buf.toString());
  		}
  
! 		if (t instanceof PyException) {
! 			return (PyException)t;
! 		} else if (t instanceof SQLException) {
  			StringBuffer buffer = new StringBuffer();
  
! 			createExceptionMessage((SQLException)t, buffer, 0);
  
  			return newError(buffer.toString());
! 		} else {
! 			return newError(t.getMessage());
! 		}
  	}