svn commit: rev 56712 - geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig

[djencks]

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;