db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davi...@apache.org
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 GMT
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());
         }
 



Mime
View raw message