You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by kr...@apache.org on 2008/04/02 10:28:19 UTC
svn commit: r643789 - in
/db/derby/code/trunk/java/client/org/apache/derby/client:
am/Connection.java net/NetConnection.java
Author: kristwaa
Date: Wed Apr 2 01:28:18 2008
New Revision: 643789
URL: http://svn.apache.org/viewvc?rev=643789&view=rev
Log:
DERBY-3586: Remove am.Connection.reset(LogWriter,ClientBaseDataSource,boolean) and called methods.
Removal of unused code in the client driver.
Patch file: derby-3586-1a-connection_reset3_removal.diff
Modified:
db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java
db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java?rev=643789&r1=643788&r2=643789&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java Wed Apr 2 01:28:18 2008
@@ -2098,21 +2098,6 @@
}
}
- synchronized public void reset(LogWriter logWriter, ClientBaseDataSource ds,
- boolean recomputeFromDataSource) throws SqlException {
- if (logWriter != null) {
- logWriter.traceConnectResetEntry(this, logWriter, null, (ds != null) ? ds : dataSource_);
- }
- try {
- reset_(logWriter, ds, recomputeFromDataSource);
- } catch (SqlException sqle) {
- DisconnectException de = new DisconnectException(agent_,
- new ClientMessageId(SQLState.CONNECTION_FAILED_ON_RESET));
- de.setNextException(sqle);
- throw de;
- }
- }
-
synchronized public void lightReset() throws SqlException {
if (!open_ && !availableForReuse_) {
return;
@@ -2123,10 +2108,6 @@
abstract protected void reset_(LogWriter logWriter, String user,
String password, ClientBaseDataSource ds,
- boolean recomputerFromDataSource) throws SqlException;
-
- abstract protected void reset_(LogWriter logWriter,
- ClientBaseDataSource ds,
boolean recomputerFromDataSource) throws SqlException;
/**
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java?rev=643789&r1=643788&r2=643789&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java Wed Apr 2 01:28:18 2008
@@ -354,43 +354,6 @@
resetNetConnection(logWriter, user, password, ds, recomputeFromDataSource);
}
- protected void reset_(org.apache.derby.client.am.LogWriter logWriter,
- ClientBaseDataSource ds,
- boolean recomputeFromDataSource) throws SqlException {
- checkResetPreconditions(logWriter, null, null, ds);
- resetNetConnection(logWriter, ds, recomputeFromDataSource);
- }
-
- private void resetNetConnection(org.apache.derby.client.am.LogWriter logWriter,
- org.apache.derby.jdbc.ClientBaseDataSource ds,
- boolean recomputeFromDataSource) throws SqlException {
- super.resetConnection(logWriter, null, ds, recomputeFromDataSource);
- //----------------------------------------------------
- if (recomputeFromDataSource) {
- // do not reset managers on a connection reset. this information shouldn't
- // change and can be used to check secmec support.
-
- targetExtnam_ = null;
- targetSrvclsnm_ = null;
- targetSrvnam_ = null;
- targetSrvrlslv_ = null;
- publicKey_ = null;
- targetPublicKey_ = null;
- sourceSeed_ = null;
- targetSeed_ = null;
- targetSecmec_ = 0;
- if (ds != null && securityMechanism_ == 0) {
- securityMechanism_ = ds.getSecurityMechanism();
- }
- resetConnectionAtFirstSql_ = false;
- }
- // properties prddta_ and crrtkn_ will be initialized by
- // calls to constructPrddta() and constructCrrtkn()
- //----------------------------------------------------------
- boolean isDeferredReset = flowReconnect(null, securityMechanism_);
- completeReset(isDeferredReset, recomputeFromDataSource);
- }
-
protected void checkResetPreconditions(org.apache.derby.client.am.LogWriter logWriter,
String user,
String password,