commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ima...@apache.org
Subject svn commit: r209270 - in /jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/webdav: WebdavClientFactory.java WebdavConnectionManager.java
Date Tue, 05 Jul 2005 13:45:06 GMT
Author: imario
Date: Tue Jul  5 06:45:04 2005
New Revision: 209270

URL: http://svn.apache.org/viewcvs?rev=209270&view=rev
Log:
use threadlocal for httpconnection (WebdavConnectionManager) to work around the limitation
of webdavlib not using the MultiThreadedHttpConnectionManager.

Added:
    jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/webdav/WebdavConnectionManager.java
  (with props)
Modified:
    jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/webdav/WebdavClientFactory.java

Modified: jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/webdav/WebdavClientFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/webdav/WebdavClientFactory.java?rev=209270&r1=209269&r2=209270&view=diff
==============================================================================
--- jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/webdav/WebdavClientFactory.java
(original)
+++ jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/webdav/WebdavClientFactory.java
Tue Jul  5 06:45:04 2005
@@ -78,7 +78,7 @@
             resource.setHttpURL(url, WebdavResource.NOACTION, 1);
 
             client = resource.retrieveSessionInstance();
-            client.setHttpConnectionManager(new MultiThreadedHttpConnectionManager());
+            client.setHttpConnectionManager(new WebdavConnectionManager());
         }
         catch (final IOException e)
         {

Added: jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/webdav/WebdavConnectionManager.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/webdav/WebdavConnectionManager.java?rev=209270&view=auto
==============================================================================
--- jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/webdav/WebdavConnectionManager.java
(added)
+++ jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/webdav/WebdavConnectionManager.java
Tue Jul  5 06:45:04 2005
@@ -0,0 +1,256 @@
+package org.apache.commons.vfs.provider.webdav;
+
+import org.apache.commons.httpclient.HostConfiguration;
+import org.apache.commons.httpclient.HttpConnection;
+import org.apache.commons.httpclient.HttpConnectionManager;
+import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * A connection manager that provides access to a single HttpConnection.  This
+ * manager makes no attempt to provide exclusive access to the contained
+ * HttpConnection.
+ *
+ * ThreadLocal connection.
+ *
+ * @author <a href="mailto:imario@apache.org">Mario Ivankovits</a>
+ * @author <a href="mailto:becke@u.washington.edu">Michael Becke</a>
+ * @author Eric Johnson
+ * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
+ * @author <a href="mailto:oleg@ural.ru">Oleg Kalnichevski</a>
+ * @author Laura Werner
+ * @since 2.0
+ */
+public class WebdavConnectionManager implements HttpConnectionManager
+{
+    /**
+     * Since the same connection is about to be reused, make sure the
+     * previous request was completely processed, and if not
+     * consume it now.
+     *
+     * @param conn The connection
+     */
+    static void finishLastResponse(HttpConnection conn)
+    {
+        InputStream lastResponse = conn.getLastResponseInputStream();
+        if (lastResponse != null)
+        {
+            conn.setLastResponseInputStream(null);
+            try
+            {
+                lastResponse.close();
+            }
+            catch (IOException ioe)
+            {
+                //FIXME: badness - close to force reconnect.
+                conn.close();
+            }
+        }
+    }
+
+    /**
+     * The thread data
+     */
+    protected ThreadLocal localHttpConnection = new ThreadLocal()
+    {
+        protected Object initialValue()
+        {
+            return new Entry();
+        }
+    };
+
+    /**
+     * Collection of parameters associated with this connection manager.
+     */
+    private HttpConnectionManagerParams params = new HttpConnectionManagerParams();
+
+    private static class Entry
+    {
+        /**
+         * The http connection
+         */
+        private HttpConnection conn = null;
+
+        /**
+         * The time the connection was made idle.
+         */
+        private long idleStartTime = Long.MAX_VALUE;
+    }
+
+    public WebdavConnectionManager()
+    {
+    }
+
+    protected HttpConnection getLocalHttpConnection()
+    {
+        return ((Entry) localHttpConnection.get()).conn;
+    }
+
+    protected void setLocalHttpConnection(HttpConnection conn)
+    {
+        ((Entry) localHttpConnection.get()).conn = conn;
+    }
+
+    protected long getIdleStartTime()
+    {
+        return ((Entry) localHttpConnection.get()).idleStartTime;
+    }
+
+    protected void setIdleStartTime(long idleStartTime)
+    {
+        ((Entry) localHttpConnection.get()).idleStartTime = idleStartTime;
+    }
+
+    /**
+     * @see HttpConnectionManager#getConnection(org.apache.commons.httpclient.HostConfiguration)
+     */
+    public HttpConnection getConnection(HostConfiguration hostConfiguration)
+    {
+        return getConnection(hostConfiguration, 0);
+    }
+
+    /**
+     * Gets the staleCheckingEnabled value to be set on HttpConnections that are created.
+     *
+     * @return <code>true</code> if stale checking will be enabled on HttpConections
+     * @see HttpConnection#isStaleCheckingEnabled()
+     * @deprecated Use {@link HttpConnectionManagerParams#isStaleCheckingEnabled()},
+     *             {@link HttpConnectionManager#getParams()}.
+     */
+    public boolean isConnectionStaleCheckingEnabled()
+    {
+        return this.params.isStaleCheckingEnabled();
+    }
+
+    /**
+     * Sets the staleCheckingEnabled value to be set on HttpConnections that are created.
+     *
+     * @param connectionStaleCheckingEnabled <code>true</code> if stale checking
will be enabled
+     *                                       on HttpConections
+     * @see HttpConnection#setStaleCheckingEnabled(boolean)
+     * @deprecated Use {@link HttpConnectionManagerParams#setStaleCheckingEnabled(boolean)},
+     *             {@link HttpConnectionManager#getParams()}.
+     */
+    public void setConnectionStaleCheckingEnabled(boolean connectionStaleCheckingEnabled)
+    {
+        this.params.setStaleCheckingEnabled(connectionStaleCheckingEnabled);
+    }
+
+    /**
+     * @see HttpConnectionManager#getConnectionWithTimeout(HostConfiguration, long)
+     * @since 3.0
+     */
+    public HttpConnection getConnectionWithTimeout(
+        HostConfiguration hostConfiguration, long timeout)
+    {
+
+        HttpConnection httpConnection = getLocalHttpConnection();
+        if (httpConnection == null)
+        {
+            httpConnection = new HttpConnection(hostConfiguration);
+            setLocalHttpConnection(httpConnection);
+            httpConnection.setHttpConnectionManager(this);
+            httpConnection.getParams().setDefaults(this.params);
+        }
+        else
+        {
+
+            // make sure the host and proxy are correct for this connection
+            // close it and set the values if they are not
+            if (!hostConfiguration.hostEquals(httpConnection)
+                || !hostConfiguration.proxyEquals(httpConnection))
+            {
+
+                if (httpConnection.isOpen())
+                {
+                    httpConnection.close();
+                }
+
+                httpConnection.setHost(hostConfiguration.getHost());
+                httpConnection.setPort(hostConfiguration.getPort());
+                httpConnection.setProtocol(hostConfiguration.getProtocol());
+                httpConnection.setLocalAddress(hostConfiguration.getLocalAddress());
+
+                httpConnection.setProxyHost(hostConfiguration.getProxyHost());
+                httpConnection.setProxyPort(hostConfiguration.getProxyPort());
+            }
+            else
+            {
+                finishLastResponse(httpConnection);
+            }
+        }
+
+        // remove the connection from the timeout handler
+        setIdleStartTime(Long.MAX_VALUE);
+
+        return httpConnection;
+    }
+
+    /**
+     * @see HttpConnectionManager#getConnection(HostConfiguration, long)
+     * @deprecated Use #getConnectionWithTimeout(HostConfiguration, long)
+     */
+    public HttpConnection getConnection(
+        HostConfiguration hostConfiguration, long timeout)
+    {
+        return getConnectionWithTimeout(hostConfiguration, timeout);
+    }
+
+    /**
+     * @see HttpConnectionManager#releaseConnection(org.apache.commons.httpclient.HttpConnection)
+     */
+    public void releaseConnection(HttpConnection conn)
+    {
+        if (conn != getLocalHttpConnection())
+        {
+            throw new IllegalStateException("Unexpected release of an unknown connection.");
+        }
+
+        finishLastResponse(getLocalHttpConnection());
+
+        // track the time the connection was made idle
+        setIdleStartTime(System.currentTimeMillis());
+    }
+
+    /**
+     * Returns {@link HttpConnectionManagerParams parameters} associated
+     * with this connection manager.
+     *
+     * @see HttpConnectionManagerParams
+     * @since 2.1
+     */
+    public HttpConnectionManagerParams getParams()
+    {
+        return this.params;
+    }
+
+    /**
+     * Assigns {@link HttpConnectionManagerParams parameters} for this
+     * connection manager.
+     *
+     * @see HttpConnectionManagerParams
+     * @since 2.1
+     */
+    public void setParams(final HttpConnectionManagerParams params)
+    {
+        if (params == null)
+        {
+            throw new IllegalArgumentException("Parameters may not be null");
+        }
+        this.params = params;
+    }
+
+    /**
+     * @since 3.0
+     */
+    public void closeIdleConnections(long idleTimeout)
+    {
+        long maxIdleTime = System.currentTimeMillis() - idleTimeout;
+        if (getIdleStartTime() <= maxIdleTime)
+        {
+            getLocalHttpConnection().close();
+        }
+    }
+}

Propchange: jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/webdav/WebdavConnectionManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/webdav/WebdavConnectionManager.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/webdav/WebdavConnectionManager.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



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


Mime
View raw message