Author: markt
Date: Wed Dec 24 08:35:46 2008
New Revision: 729332
URL: http://svn.apache.org/viewvc?rev=729332&view=rev
Log:
Some more simple generics and other Eclipse warnings
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=729332&r1=729331&r2=729332&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Wed Dec 24 08:35:46 2008
@@ -260,14 +260,14 @@
}
//update our map of members, expire some if we didn't receive a ping
back
synchronized (mapMembers) {
- Iterator it = mapMembers.entrySet().iterator();
+ Iterator<Map.Entry<Member, Long>> it =
mapMembers.entrySet().iterator();
long now = System.currentTimeMillis();
while ( it.hasNext() ) {
- Map.Entry entry = (Map.Entry)it.next();
- long access = ((Long)entry.getValue()).longValue();
+ Map.Entry<Member,Long> entry = it.next();
+ long access = entry.getValue().longValue();
if ( (now - access) > timeout ) {
it.remove();
- memberDisappeared( (Member) entry.getKey());
+ memberDisappeared(entry.getKey());
}
}
}//synch
@@ -377,7 +377,7 @@
MapEntry entry = (MapEntry)super.get(key);
if ( entry == null ) return;
if ( !entry.isSerializable() ) return;
- if (entry != null && entry.isPrimary() && entry.getBackupNodes()!=
null && entry.getBackupNodes().length > 0) {
+ if (entry.isPrimary() && entry.getBackupNodes()!= null &&
entry.getBackupNodes().length > 0) {
Object value = entry.getValue();
//check to see if we need to replicate this object
isDirty()||complete
boolean repl = complete || ( (value instanceof ReplicatedMapEntry)
&& ( (ReplicatedMapEntry) value).isDirty());
@@ -1055,10 +1055,6 @@
return counter;
}
- protected boolean removeEldestEntry(Map.Entry eldest) {
- return false;
- }
-
public boolean isEmpty() {
return size()==0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
