You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ro...@apache.org on 2007/07/30 21:11:07 UTC
svn commit: r561097 - in
/jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm:
BasicPoolEntry.java ConnPoolByRoute.java
Author: rolandw
Date: Mon Jul 30 12:11:06 2007
New Revision: 561097
URL: http://svn.apache.org/viewvc?view=rev&rev=561097
Log:
even more cleanup
Modified:
jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java
jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java?view=diff&rev=561097&r1=561096&r2=561097
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java Mon Jul 30 12:11:06 2007
@@ -46,9 +46,6 @@
*/
public class BasicPoolEntry extends AbstractPoolEntry {
- /** The connection pool. */
- private AbstractConnPool connPool;
-
/** The connection operator. */
//@@@ move to base class, drop getOperator()?
private ClientConnectionOperator connOperator;
@@ -65,28 +62,21 @@
/**
* Creates a new pool entry.
*
- * @param pool the connection pool
* @param op the connection operator
* @param route the planned route for the connection
* @param queue the reference queue for tracking GC of this entry,
* or <code>null</code>
*/
- public BasicPoolEntry(AbstractConnPool pool,
- ClientConnectionOperator op,
+ public BasicPoolEntry(ClientConnectionOperator op,
HttpRoute route,
ReferenceQueue queue) {
//@@@ create connection in base? or delay creation until needed?
super(op.createConnection(), route);
- if (pool == null) {
- throw new IllegalArgumentException
- ("Connection pool must not be null.");
- }
if (route == null) {
throw new IllegalArgumentException
("Planned route must not be null.");
}
- this.connPool = pool;
this.connOperator = op;
this.reference = new BasicPoolEntryRef(this, queue);
}
@@ -108,10 +98,6 @@
protected final WeakReference getWeakRef() {
return this.reference;
- }
-
- protected final AbstractConnPool getConnPool() {
- return this.connPool;
}
Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java?view=diff&rev=561097&r1=561096&r2=561097
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java Mon Jul 30 12:11:06 2007
@@ -394,8 +394,7 @@
LOG.debug("Creating new connection. " + rcp.route);
}
// the entry will create the connection when needed
- BasicPoolEntry entry =
- new BasicPoolEntry(this, op, rcp.route, refQueue);
+ BasicPoolEntry entry = new BasicPoolEntry(op, rcp.route, refQueue);
numConnections++;
rcp.numConnections++;