Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 57921 invoked from network); 26 Jan 2011 19:03:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 26 Jan 2011 19:03:40 -0000 Received: (qmail 49137 invoked by uid 500); 26 Jan 2011 19:03:40 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 49076 invoked by uid 500); 26 Jan 2011 19:03:40 -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 49069 invoked by uid 99); 26 Jan 2011 19:03:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Jan 2011 19:03:40 +0000 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.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Jan 2011 19:03:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 60D4023888EC; Wed, 26 Jan 2011 19:03:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1063831 - /db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java Date: Wed, 26 Jan 2011 19:03:19 -0000 To: derby-commits@db.apache.org From: rhillegas@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110126190319.60D4023888EC@eris.apache.org> Author: rhillegas Date: Wed Jan 26 19:03:19 2011 New Revision: 1063831 URL: http://svn.apache.org/viewvc?rev=1063831&view=rev Log: DERBY-4869: Don't bother trying to change the current schema if the old schema is the same as the new one. Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.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=1063831&r1=1063830&r2=1063831&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 Jan 26 19:03:19 2011 @@ -2502,6 +2502,11 @@ public abstract class Connection throw se.getSQLException(); } + // nothing to do if the current schema name is cached and is the same + // as the new schema name + if ( ( currentSchemaName_ != null) && (currentSchemaName_.equals( schemaName )) ) + { return; } + java.sql.PreparedStatement ps = null; try {