Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 67226 invoked from network); 6 Nov 2004 00:40:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 6 Nov 2004 00:40:45 -0000 Received: (qmail 51566 invoked by uid 500); 6 Nov 2004 00:40:44 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 51547 invoked by uid 500); 6 Nov 2004 00:40:44 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: dev@geronimo.apache.org Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 51534 invoked by uid 99); 6 Nov 2004 00:40:43 -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; Fri, 05 Nov 2004 16:40:43 -0800 Received: (qmail 67213 invoked by uid 65534); 6 Nov 2004 00:40:42 -0000 Date: 6 Nov 2004 00:40:42 -0000 Message-ID: <20041106004042.67210.qmail@minotaur.apache.org> From: djencks@apache.org To: scm@geronimo.apache.org Subject: svn commit: rev 56712 - geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: djencks Date: Fri Nov 5 16:40:41 2004 New Revision: 56712 Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/PartitionedPool.java geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/SinglePool.java Log: Make these actually serializable after use so gbean persistence works with them Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/PartitionedPool.java ============================================================================== --- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/PartitionedPool.java (original) +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/PartitionedPool.java Fri Nov 5 16:40:41 2004 @@ -22,11 +22,8 @@ import org.apache.geronimo.connector.outbound.PoolingAttributes; /** - * - * * @version $Rev$ $Date$ - * - * */ + */ public class PartitionedPool implements PoolingSupport { private boolean partitionByConnectionRequestInfo; @@ -34,7 +31,7 @@ private final SinglePool singlePool; - private PoolingAttributes poolingAttributes; + private transient PoolingAttributes poolingAttributes; public PartitionedPool(int maxSize, int minSize, int blockingTimeoutMilliseconds, int idleTimeoutMinutes, boolean matchOne, boolean matchAll, boolean selectOneAssumeMatch, boolean partitionByConnectionRequestInfo, boolean partitionBySubject) { singlePool = new SinglePool(maxSize, minSize, blockingTimeoutMilliseconds, idleTimeoutMinutes, matchOne, matchAll, selectOneAssumeMatch); @@ -106,15 +103,14 @@ singlePool.setSelectOneAssumeMatch(selectOneAssumeMatch); } - public ConnectionInterceptor addPoolingInterceptors(ConnectionInterceptor tail) { - MultiPoolConnectionInterceptor pool = new MultiPoolConnectionInterceptor( - tail, - singlePool, - isPartitionBySubject(), - isPartitionByConnectionRequestInfo()); - this.poolingAttributes = pool; - return pool; - } + public ConnectionInterceptor addPoolingInterceptors(ConnectionInterceptor tail) { + MultiPoolConnectionInterceptor pool = new MultiPoolConnectionInterceptor(tail, + singlePool, + isPartitionBySubject(), + isPartitionByConnectionRequestInfo()); + this.poolingAttributes = pool; + return pool; + } public int getPartitionCount() { return poolingAttributes.getPartitionCount(); Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/SinglePool.java ============================================================================== --- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/SinglePool.java (original) +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/SinglePool.java Fri Nov 5 16:40:41 2004 @@ -34,7 +34,7 @@ private boolean matchAll; private boolean selectOneAssumeMatch; - private PoolingAttributes pool; + private transient PoolingAttributes pool; public SinglePool(int maxSize, int minSize, int blockingTimeoutMilliseconds, int idleTimeoutMinutes, boolean matchOne, boolean matchAll, boolean selectOneAssumeMatch) { this.maxSize = maxSize;