You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2009/01/14 21:45:28 UTC

svn commit: r734506 - in /tomcat/trunk/java/org/apache/catalina/tribes/io: BufferPool.java BufferPool14Impl.java

Author: markt
Date: Wed Jan 14 12:45:28 2009
New Revision: 734506

URL: http://svn.apache.org/viewvc?rev=734506&view=rev
Log:
Remove 1.4 impl since we must be using a 1.6 JVM.

Removed:
    tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool14Impl.java
Modified:
    tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java

Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java?rev=734506&r1=734505&r2=734506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java Wed Jan 14 12:45:28 2009
@@ -61,16 +61,12 @@
                    BufferPoolAPI pool = null;
                    Class<?> clazz = null;
                    try {
+                       // TODO Is this approach still required?
                        clazz = Class.forName("org.apache.catalina.tribes.io.BufferPool15Impl");
                        pool = (BufferPoolAPI)clazz.newInstance();
                    } catch ( Throwable x ) {
-                       try {
-                           clazz = Class.forName("org.apache.catalina.tribes.io.BufferPool14Impl");
-                           pool = (BufferPoolAPI)clazz.newInstance();
-                       } catch ( Throwable e ) {
-                           log.warn("Unable to initilize BufferPool, not pooling XByteBuffer objects:"+x.getMessage());
-                           if ( log.isDebugEnabled() ) log.debug("Unable to initilize BufferPool, not pooling XByteBuffer objects:",x);
-                       }
+                       log.warn("Unable to initilize BufferPool, not pooling XByteBuffer objects:"+x.getMessage());
+                       if ( log.isDebugEnabled() ) log.debug("Unable to initilize BufferPool, not pooling XByteBuffer objects:",x);
                    }
                    pool.setMaxSize(DEFAULT_POOL_SIZE);
                    log.info("Created a buffer pool with max size:"+DEFAULT_POOL_SIZE+" bytes of type:"+(clazz!=null?clazz.getName():"null"));



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org