manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
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 GMT
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;
   }



Mime
View raw message