Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 65572 invoked from network); 2 Jun 2006 23:44:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 2 Jun 2006 23:44:55 -0000 Received: (qmail 5084 invoked by uid 500); 2 Jun 2006 23:44:55 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 5049 invoked by uid 500); 2 Jun 2006 23:44:55 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 5038 invoked by uid 99); 2 Jun 2006 23:44:54 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Jun 2006 16:44:54 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Jun 2006 16:44:54 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 3D5641A983A; Fri, 2 Jun 2006 16:44:34 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r411336 - in /db/derby/code/trunk/java/client/org/apache/derby/client: am/SqlException.java net/NetAgent.java Date: Fri, 02 Jun 2006 23:44:33 -0000 To: derby-commits@db.apache.org From: davidvc@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060602234434.3D5641A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: davidvc Date: Fri Jun 2 16:44:33 2006 New Revision: 411336 URL: http://svn.apache.org/viewvc?rev=411336&view=rev Log: DERBY-1069: Client unwraps exceptions now (the problem was in NetAgent). Also fixed a bug where the cause stack trace was not being logged in the trace file, and a formatting bug with the port number Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java db/derby/code/trunk/java/client/org/apache/derby/client/net/NetAgent.java Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java?rev=411336&r1=411335&r2=411336&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java Fri Jun 2 16:44:33 2006 @@ -168,15 +168,12 @@ { this( logwriter, + cause, getMessageUtil().getCompleteMessage( msgid.msgid, args), ExceptionUtil.getSQLStateFromIdentifier(msgid.msgid), - ExceptionUtil.getSeverityFromIdentifier(msgid.msgid)); - - if ( cause != null ) { - this.setThrowable(cause); - } + ExceptionUtil.getSeverityFromIdentifier(msgid.msgid)); } // Use the following SQLExceptions when you want to override the error Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetAgent.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetAgent.java?rev=411336&r1=411335&r2=411336&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetAgent.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetAgent.java Fri Jun 2 16:44:33 2006 @@ -122,8 +122,8 @@ } catch (java.security.PrivilegedActionException e) { throw new DisconnectException(this, new ClientMessageId(SQLState.CONNECT_UNABLE_TO_CONNECT_TO_SERVER), - new Object[] { e.getClass().getName(), server, new Integer(port), - e.getException().getMessage() }, + new Object[] { e.getException().getClass().getName(), server, + Integer.toString(port), e.getException().getMessage() }, e.getException()); }