Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use Queue interface in ConnPoolByRoute 

git-svn-id: https://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk@604252 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Roland Weber 2007-12-14 18:43:46 +00:00
parent 8941651d8a
commit 289c793a54
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
module-client/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
View File

@ -32,6 +32,7 @@ package org.apache.http.impl.conn.tsccm;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Queue;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Map; import java.util.Map;
@ -66,10 +67,10 @@ public class ConnPoolByRoute extends AbstractConnPool {
/** The list of free connections */ /** The list of free connections */
private LinkedList<BasicPoolEntry> freeConnections; private Queue<BasicPoolEntry> freeConnections;
/** The list of WaitingThreads waiting for a connection */ /** The list of WaitingThreads waiting for a connection */
private LinkedList<WaitingThread> waitingThreads; private Queue<WaitingThread> waitingThreads;
/** /**
* A map of route-specific pools. * A map of route-specific pools.
@ -113,6 +114,7 @@ public class ConnPoolByRoute extends AbstractConnPool {
public ConnPoolByRoute(ClientConnectionManager mgr) { public ConnPoolByRoute(ClientConnectionManager mgr) {
super(mgr); super(mgr);
//@@@ use factory method, at least for waitingThreads
freeConnections = new LinkedList<BasicPoolEntry>(); freeConnections = new LinkedList<BasicPoolEntry>();
waitingThreads = new LinkedList<WaitingThread>(); waitingThreads = new LinkedList<WaitingThread>();
routeToPool = new HashMap<HttpRoute,RouteSpecificPool>(); routeToPool = new HashMap<HttpRoute,RouteSpecificPool>();
@ -239,7 +241,7 @@ public class ConnPoolByRoute extends AbstractConnPool {
} }
rospl.waitingThreads.addLast(waitingThread); rospl.waitingThreads.addLast(waitingThread);
waitingThreads.addLast(waitingThread); waitingThreads.add(waitingThread);
wait(timeToWait); wait(timeToWait);
} catch (InterruptedException e) { } catch (InterruptedException e) {
@ -412,7 +414,7 @@ public class ConnPoolByRoute extends AbstractConnPool {
//@@@ with get() instead of remove, we could //@@@ with get() instead of remove, we could
//@@@ leave the removing to deleteEntry() //@@@ leave the removing to deleteEntry()
BasicPoolEntry entry = (BasicPoolEntry) freeConnections.removeFirst(); BasicPoolEntry entry = freeConnections.remove();
if (entry != null) { if (entry != null) {
deleteEntry(entry); deleteEntry(entry);
@ -465,7 +467,7 @@ public class ConnPoolByRoute extends AbstractConnPool {
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
LOG.debug("Notifying thread waiting on any pool."); LOG.debug("Notifying thread waiting on any pool.");
} }
waitingThread = waitingThreads.removeFirst(); waitingThread = waitingThreads.remove();
waitingThread.pool.waitingThreads.remove(waitingThread); waitingThread.pool.waitingThreads.remove(waitingThread);
} else if (LOG.isDebugEnabled()) { } else if (LOG.isDebugEnabled()) {