cvs commit: incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound ConnectionManagerDeployment.java

[djencks]

djencks     2004/04/14 09:44:39

  Modified:    modules/connector/src/java/org/apache/geronimo/connector/outbound
                        ConnectionManagerDeployment.java
  Log:
  Reenable pooling, it wasn't broken
  
  Revision  Changes    Path
  1.9       +16 -16    
incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerDeployment.java
  
  Index: ConnectionManagerDeployment.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerDeployment.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ConnectionManagerDeployment.java  14 Apr 2004 04:01:24 -0000      1.8
  +++ ConnectionManagerDeployment.java  14 Apr 2004 16:44:39 -0000      1.9
  @@ -123,21 +123,21 @@
                   stack = new XAResourceInsertionInterceptor(stack);
               }
           }
  -//        if (useSubject || useConnectionRequestInfo) {
  -//            stack = new MultiPoolConnectionInterceptor(
  -//                    stack,
  -//                    maxSize,
  -//                    blockingTimeout,
  -//                    useSubject,
  -//                    useConnectionRequestInfo);
  -//        } else {
  -//            stack = new SinglePoolConnectionInterceptor(
  -//                    stack,
  -//                    null,
  -//                    null,
  -//                    maxSize,
  -//                    blockingTimeout);
  -//        }
  +        if (useSubject || useConnectionRequestInfo) {
  +            stack = new MultiPoolConnectionInterceptor(
  +                    stack,
  +                    maxSize,
  +                    blockingTimeout,
  +                    useSubject,
  +                    useConnectionRequestInfo);
  +        } else {
  +            stack = new SinglePoolConnectionInterceptor(
  +                    stack,
  +                    null,
  +                    null,
  +                    maxSize,
  +                    blockingTimeout);
  +        }
           if (realmBridge != null) {
               stack = new SubjectInterceptor(stack, realmBridge);
           }