Return-Path: X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9D9AC18F1E for ; Tue, 23 Jun 2015 17:14:40 +0000 (UTC) Received: (qmail 79315 invoked by uid 500); 23 Jun 2015 17:14:40 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 79267 invoked by uid 500); 23 Jun 2015 17:14:40 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 79255 invoked by uid 99); 23 Jun 2015 17:14:40 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Jun 2015 17:14:40 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 321C2AC065B for ; Tue, 23 Jun 2015 17:14:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1687097 - /manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java Date: Tue, 23 Jun 2015 17:14:40 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150623171440.321C2AC065B@hades.apache.org> Author: kwright Date: Tue Jun 23 17:14:39 2015 New Revision: 1687097 URL: http://svn.apache.org/r1687097 Log: Second fix for CONNECTORS-1202. Modified: manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java Modified: manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java?rev=1687097&r1=1687096&r2=1687097&view=diff ============================================================================== --- manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java (original) +++ manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java Tue Jun 23 17:14:39 2015 @@ -163,8 +163,17 @@ public class ConnectionPool // it into the pool. if (rval != null) { + // We have a handle, so just free it and leave activeConnections alone release(rval); } + else + { + // We didn't manage to create the handle, so decrement active connections. + synchronized (this) + { + activeConnections--; + } + } } } }