db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r1565379 - in /db/derby/code/branches/10.8: ./ java/client/org/apache/derby/client/net/NetCursor.java java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
Date Thu, 06 Feb 2014 18:10:27 GMT
Author: myrnavl
Date: Thu Feb  6 18:10:27 2014
New Revision: 1565379

URL: http://svn.apache.org/r1565379
Log:
DERBY-6426; Fix isLoginException
  merge of revision 1550287 from trunk

Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java   (props
changed)
    db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1550287

Propchange: db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java:r1550287

Modified: db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java?rev=1565379&r1=1565378&r2=1565379&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
(original)
+++ db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
Thu Feb  6 18:10:27 2014
@@ -384,8 +384,8 @@ public final class TransactionResourceIm
      * @return true if this is a login failure exception
      */
     private boolean isLoginException(Throwable thrownException) {
-       if (thrownException instanceof StandardException) {
-           ((StandardException) thrownException).getSQLState().equals(SQLState.LOGIN_FAILED);
+       if ((thrownException instanceof StandardException) &&
+           ((StandardException) thrownException).getSQLState().equals(SQLState.LOGIN_FAILED))
{
            return true;
        }
        return false;



Mime
View raw message