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 90A3B1090E for ; Tue, 4 Feb 2014 02:05:36 +0000 (UTC) Received: (qmail 76165 invoked by uid 500); 4 Feb 2014 02:05:35 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 76114 invoked by uid 500); 4 Feb 2014 02:05:35 -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 76107 invoked by uid 99); 4 Feb 2014 02:05:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Feb 2014 02:05:35 +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; Tue, 04 Feb 2014 02:05:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 42A1423888D7; Tue, 4 Feb 2014 02:05:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1564152 - in /manifoldcf/branches/release-1.5-branch: ./ framework/core/src/main/java/org/apache/manifoldcf/core/throttler/ConnectionBin.java Date: Tue, 04 Feb 2014 02:05:14 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140204020514.42A1423888D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kwright Date: Tue Feb 4 02:05:13 2014 New Revision: 1564152 URL: http://svn.apache.org/r1564152 Log: Pull up temporary code to disable web/rss connection pooling. Part of CONNECTORS-872. Modified: manifoldcf/branches/release-1.5-branch/ (props changed) manifoldcf/branches/release-1.5-branch/framework/core/src/main/java/org/apache/manifoldcf/core/throttler/ConnectionBin.java Propchange: manifoldcf/branches/release-1.5-branch/ ------------------------------------------------------------------------------ Merged /manifoldcf/trunk:r1564151 Modified: manifoldcf/branches/release-1.5-branch/framework/core/src/main/java/org/apache/manifoldcf/core/throttler/ConnectionBin.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/framework/core/src/main/java/org/apache/manifoldcf/core/throttler/ConnectionBin.java?rev=1564152&r1=1564151&r2=1564152&view=diff ============================================================================== --- manifoldcf/branches/release-1.5-branch/framework/core/src/main/java/org/apache/manifoldcf/core/throttler/ConnectionBin.java (original) +++ manifoldcf/branches/release-1.5-branch/framework/core/src/main/java/org/apache/manifoldcf/core/throttler/ConnectionBin.java Tue Feb 4 02:05:13 2014 @@ -211,7 +211,10 @@ public class ConnectionBin { return CONNECTION_DESTROY; } - return CONNECTION_WITHINBOUNDS; + // Hack: always return CONNECTION_DESTROY, because we don't have a good way of allocating + // connections in multiple pools that share the same connection bin. See CONNECTORS-872. + //return CONNECTION_WITHINBOUNDS; + return CONNECTION_DESTROY; } return CONNECTION_POOLEMPTY; }