Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 15132 invoked from network); 2 Apr 2008 08:33:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Apr 2008 08:33:26 -0000 Received: (qmail 29217 invoked by uid 500); 2 Apr 2008 08:33:26 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 29189 invoked by uid 500); 2 Apr 2008 08:33:26 -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 29177 invoked by uid 99); 2 Apr 2008 08:33:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Apr 2008 01:33:26 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Apr 2008 08:32:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 13E541A9832; Wed, 2 Apr 2008 01:33:03 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r643790 - in /db/derby/code/branches/10.4/java/client/org/apache/derby/client: am/Connection.java net/NetConnection.java Date: Wed, 02 Apr 2008 08:33:02 -0000 To: derby-commits@db.apache.org From: kristwaa@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080402083303.13E541A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kristwaa Date: Wed Apr 2 01:33:00 2008 New Revision: 643790 URL: http://svn.apache.org/viewvc?rev=643790&view=rev Log: DERBY-3586: Remove am.Connection.reset(LogWriter,ClientBaseDataSource,boolean) and called methods. Merged change from trunk revision 643789 (derby-3586-1a-connection_reset3_removal.diff). Modified: db/derby/code/branches/10.4/java/client/org/apache/derby/client/am/Connection.java db/derby/code/branches/10.4/java/client/org/apache/derby/client/net/NetConnection.java Modified: db/derby/code/branches/10.4/java/client/org/apache/derby/client/am/Connection.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/client/org/apache/derby/client/am/Connection.java?rev=643790&r1=643789&r2=643790&view=diff ============================================================================== --- db/derby/code/branches/10.4/java/client/org/apache/derby/client/am/Connection.java (original) +++ db/derby/code/branches/10.4/java/client/org/apache/derby/client/am/Connection.java Wed Apr 2 01:33:00 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/branches/10.4/java/client/org/apache/derby/client/net/NetConnection.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/client/org/apache/derby/client/net/NetConnection.java?rev=643790&r1=643789&r2=643790&view=diff ============================================================================== --- db/derby/code/branches/10.4/java/client/org/apache/derby/client/net/NetConnection.java (original) +++ db/derby/code/branches/10.4/java/client/org/apache/derby/client/net/NetConnection.java Wed Apr 2 01:33:00 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,