Removed unnecessary casts; minor cleanups
git-svn-id: https://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk@603878 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
b62ae8fc19
commit
baf3239aec
|
@ -256,7 +256,7 @@ public abstract class AbstractConnPool implements RefQueueHandler {
|
|||
while (iter.hasNext()) {
|
||||
BasicPoolEntryRef per = iter.next();
|
||||
iter.remove();
|
||||
BasicPoolEntry entry = (BasicPoolEntry) per.get();
|
||||
BasicPoolEntry entry = per.get();
|
||||
if (entry != null) {
|
||||
closeConnection(entry.getConnection());
|
||||
}
|
||||
|
|
|
@ -486,7 +486,7 @@ public class ConnPoolByRoute extends AbstractConnPool {
|
|||
|
||||
Iterator<BasicPoolEntry> iter = freeConnections.iterator();
|
||||
while (iter.hasNext()) {
|
||||
BasicPoolEntry entry = (BasicPoolEntry) iter.next();
|
||||
BasicPoolEntry entry = iter.next();
|
||||
if (!entry.getConnection().isOpen()) {
|
||||
iter.remove();
|
||||
deleteEntry(entry);
|
||||
|
|
|
@ -34,6 +34,7 @@ package org.apache.http.conn;
|
|||
import java.net.InetAddress;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.Set;
|
||||
|
||||
import junit.framework.Test;
|
||||
import junit.framework.TestCase;
|
||||
|
@ -198,7 +199,7 @@ public class TestHttpRoute extends TestCase {
|
|||
assertTrue ("routettt.layer" , routettt.isLayered());
|
||||
|
||||
|
||||
HashSet<HttpRoute> routes = new HashSet<HttpRoute>();
|
||||
Set<HttpRoute> routes = new HashSet<HttpRoute>();
|
||||
routes.add(routefff);
|
||||
routes.add(routefft);
|
||||
routes.add(routeftf);
|
||||
|
@ -211,7 +212,7 @@ public class TestHttpRoute extends TestCase {
|
|||
|
||||
// we can't test hashCode in general due to it's dependency
|
||||
// on InetAddress and HttpHost, but we can check for the flags
|
||||
HashSet<Integer> routecodes = new HashSet<Integer>();
|
||||
Set<Integer> routecodes = new HashSet<Integer>();
|
||||
routecodes.add(new Integer(routefff.hashCode()));
|
||||
routecodes.add(new Integer(routefft.hashCode()));
|
||||
routecodes.add(new Integer(routeftf.hashCode()));
|
||||
|
@ -223,7 +224,7 @@ public class TestHttpRoute extends TestCase {
|
|||
assertEquals("some flagged routes have same hashCode",
|
||||
8, routecodes.size());
|
||||
|
||||
HashSet<String> routestrings = new HashSet<String>();
|
||||
Set<String> routestrings = new HashSet<String>();
|
||||
routestrings.add(routefff.toString());
|
||||
routestrings.add(routefft.toString());
|
||||
routestrings.add(routeftf.toString());
|
||||
|
@ -390,7 +391,7 @@ public class TestHttpRoute extends TestCase {
|
|||
|
||||
// now check that all of the routes are different from eachother
|
||||
// except for those that aren't :-)
|
||||
HashSet<HttpRoute> routes = new HashSet<HttpRoute>();
|
||||
Set<HttpRoute> routes = new HashSet<HttpRoute>();
|
||||
routes.add(route1a);
|
||||
routes.add(route2a);
|
||||
routes.add(route2b);
|
||||
|
@ -415,7 +416,7 @@ public class TestHttpRoute extends TestCase {
|
|||
}
|
||||
|
||||
// and don't forget toString
|
||||
HashSet<String> routestrings = new HashSet<String>();
|
||||
Set<String> routestrings = new HashSet<String>();
|
||||
routestrings.add(route1a.toString());
|
||||
routestrings.add(route2a.toString());
|
||||
routestrings.add(route2b.toString());
|
||||
|
|
Loading…
Reference in New Issue