Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 41880 invoked from network); 2 Nov 2004 20:05:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 2 Nov 2004 20:05:29 -0000 Received: (qmail 10560 invoked by uid 500); 2 Nov 2004 20:05:16 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 10346 invoked by uid 500); 2 Nov 2004 20:05:14 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 10333 invoked by uid 500); 2 Nov 2004 20:05:14 -0000 Received: (qmail 10329 invoked by uid 99); 2 Nov 2004 20:05:14 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 02 Nov 2004 12:05:14 -0800 Received: (qmail 41725 invoked by uid 1923); 2 Nov 2004 20:05:13 -0000 Date: 2 Nov 2004 20:05:13 -0000 Message-ID: <20041102200513.41724.qmail@minotaur.apache.org> From: pero@apache.org To: jakarta-tomcat-catalina-cvs@apache.org Subject: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session JDBCStore.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N pero 2004/11/02 12:05:12 Modified: catalina/src/share/org/apache/catalina/session JDBCStore.java Log: reformat the changes after a hint from bill. :-) Revision Changes Path 1.12 +27 -28 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/JDBCStore.java Index: JDBCStore.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/JDBCStore.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- JDBCStore.java 2 Nov 2004 19:07:50 -0000 1.11 +++ JDBCStore.java 2 Nov 2004 20:05:12 -0000 1.12 @@ -452,11 +452,11 @@ } try { if (preparedKeysSql == null) { - String keysSql = - "SELECT " + sessionIdCol + " FROM " + sessionTable + - " WHERE " + sessionAppCol + " = ?"; + String keysSql = "SELECT " + sessionIdCol + " FROM " + + sessionTable + " WHERE " + sessionAppCol + + " = ?"; preparedKeysSql = _conn.prepareStatement(keysSql); - } + } preparedKeysSql.setString(1, getName()); rst = preparedKeysSql.executeQuery(); @@ -513,11 +513,11 @@ try { if (preparedSizeSql == null) { - String sizeSql = - "SELECT COUNT(" + sessionIdCol + ") FROM " + sessionTable + - " WHERE " + sessionAppCol + " = ?"; + String sizeSql = "SELECT COUNT(" + sessionIdCol + + ") FROM " + sessionTable + " WHERE " + + sessionAppCol + " = ?"; preparedSizeSql = _conn.prepareStatement(sizeSql); - } + } preparedSizeSql.setString(1, getName()); rst = preparedSizeSql.executeQuery(); @@ -573,11 +573,11 @@ try { if (preparedLoadSql == null) { - String loadSql = - "SELECT " + sessionIdCol + ", " + sessionDataCol + " FROM " + - sessionTable + " WHERE " + sessionIdCol + " = ? AND " + - sessionAppCol + " = ?"; - preparedLoadSql = _conn.prepareStatement(loadSql); + String loadSql = "SELECT " + sessionIdCol + ", " + + sessionDataCol + " FROM " + sessionTable + + " WHERE " + sessionIdCol + " = ? AND " + + sessionAppCol + " = ?"; + preparedLoadSql = _conn.prepareStatement(loadSql); } preparedLoadSql.setString(1, id); @@ -660,9 +660,9 @@ try { if (preparedRemoveSql == null) { - String removeSql = - "DELETE FROM " + sessionTable + " WHERE " + sessionIdCol + - " = ? AND " + sessionAppCol + " = ?"; + String removeSql = "DELETE FROM " + sessionTable + + " WHERE " + sessionIdCol + " = ? AND " + + sessionAppCol + " = ?"; preparedRemoveSql = _conn.prepareStatement(removeSql); } @@ -702,8 +702,8 @@ try { if (preparedClearSql == null) { - String clearSql = - "DELETE FROM " + sessionTable + " WHERE " + sessionAppCol + " = ?"; + String clearSql = "DELETE FROM " + sessionTable + + " WHERE " + sessionAppCol + " = ?"; preparedClearSql = _conn.prepareStatement(clearSql); } @@ -759,15 +759,14 @@ in = new BufferedInputStream(bis, size); if (preparedSaveSql == null) { - String saveSql = - "INSERT INTO " + sessionTable + " (" + sessionIdCol + ", " + - sessionAppCol + ", " + - sessionDataCol + ", " + - sessionValidCol + ", " + - sessionMaxInactiveCol + ", " + - sessionLastAccessedCol + ") VALUES (?, ?, ?, ?, ?, ?)"; - preparedSaveSql = _conn.prepareStatement(saveSql); - } + String saveSql = "INSERT INTO " + sessionTable + " (" + + sessionIdCol + ", " + sessionAppCol + ", " + + sessionDataCol + ", " + sessionValidCol + + ", " + sessionMaxInactiveCol + ", " + + sessionLastAccessedCol + + ") VALUES (?, ?, ?, ?, ?, ?)"; + preparedSaveSql = _conn.prepareStatement(saveSql); + } preparedSaveSql.setString(1, session.getId()); preparedSaveSql.setString(2, getName()); --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org