db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r633011 - /db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
Date Mon, 03 Mar 2008 09:50:46 GMT
Author: dyre
Date: Mon Mar  3 01:50:46 2008
New Revision: 633011

URL: http://svn.apache.org/viewvc?rev=633011&view=rev
Log:
DERBY-3192: Cache session data in the client driver
Remove special handling of SYNCCTL in sanity-check ASSERT. Since the final 
version of the real patch piggy-backs changes caused by SYNCCTL there is no 
longer any need to omit the sanity check after SYNCCTL.

Patch file: derby-3192-fup.v1.diff
  

Modified:
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java?rev=633011&r1=633010&r2=633011&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java Mon Mar 
3 01:50:46 2008
@@ -1032,20 +1032,16 @@
                         // the data from the connection, to make sure it has
                         // not changed behind our back.
                         pbsd.refresh();
-                        if (codePoint != CodePoint.SYNCCTL) {
-                            // We expect the session attributes to have changed
-                            // after SYNCCTL, but this is handled by the client
-                            // and is not a problem
-                            SanityManager.ASSERT(!pbsd.isModified(),
-                                "Unexpected PBSD modification: " + pbsd +
-                                " after codePoint " + cpStr);
-                        }
+                        SanityManager.ASSERT(!pbsd.isModified(),
+                              "Unexpected PBSD modification: " + pbsd +
+                              " after codePoint " + cpStr);
                     }
                     // Not having a pbsd here is ok. No data has been
                     // piggy-backed and the client has no cached values.
                     // If needed it will send an explicit request to get
                     // session data
                 } catch (SQLException sqle) {
+                    server.consoleExceptionPrint(sqle);
                     SanityManager.THROWASSERT("Unexpected exception after " +
                             "codePoint "+cpStr, sqle);
                 }



Mime
View raw message