Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C57C910779 for ; Thu, 1 Aug 2013 10:14:01 +0000 (UTC) Received: (qmail 84083 invoked by uid 500); 1 Aug 2013 10:13:58 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 84001 invoked by uid 500); 1 Aug 2013 10:13:56 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 83308 invoked by uid 99); 1 Aug 2013 10:13:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Aug 2013 10:13:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Thu, 01 Aug 2013 10:13:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 28BD5238888A for ; Thu, 1 Aug 2013 10:13:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1509156 - /tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Date: Thu, 01 Aug 2013 10:13:32 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130801101332.28BD5238888A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Thu Aug 1 10:13:31 2013 New Revision: 1509156 URL: http://svn.apache.org/r1509156 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55333 Correct regression in fix for bug 55071. Don't commit the connection until after the ResultSet has been used. Modified: tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Modified: tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1509156&r1=1509155&r2=1509156&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java (original) +++ tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Thu Aug 1 10:13:31 2013 @@ -534,12 +534,12 @@ public class JDBCRealm stmt = credentials(dbConnection, username); rs = stmt.executeQuery(); - dbConnection.commit(); - if (rs.next()) { dbCredentials = rs.getString(1); } + dbConnection.commit(); + if (dbCredentials != null) { dbCredentials = dbCredentials.trim(); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org