Author: markt
Date: Wed Dec 24 07:59:03 2008
New Revision: 729323
URL: http://svn.apache.org/viewvc?rev=729323&view=rev
Log:
Generics for o.a.c.tribes.transport.bio
Fix various Eclipse warnings (unused code etc)
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java?rev=729323&r1=729322&r2=729323&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
Wed Dec 24 07:59:03 2008
@@ -41,7 +41,8 @@
}
protected long selectTimeout = 1000;
- protected HashMap bioSenders = new HashMap();
+ protected HashMap<Member, BioSender> bioSenders =
+ new HashMap<Member, BioSender>();
public synchronized void sendMessage(Member[] destination, ChannelMessage
msg) throws ChannelException {
byte[] data = XByteBuffer.createDataPackage((ChannelData)msg);
@@ -65,10 +66,10 @@
BioSender[] result = new BioSender[destination.length];
for ( int i=0; i<destination.length; i++ ) {
try {
- BioSender sender = (BioSender) bioSenders.get(destination[i]);
+ BioSender sender = bioSenders.get(destination[i]);
if (sender == null) {
sender = new BioSender();
- sender.transferProperties(this,sender);
+ AbstractSender.transferProperties(this,sender);
sender.setDestination(destination[i]);
bioSenders.put(destination[i], sender);
}
@@ -96,7 +97,7 @@
for (int i=0; i<members.length; i++ ) {
Member mbr = (Member)members[i];
try {
- BioSender sender = (BioSender)bioSenders.get(mbr);
+ BioSender sender = bioSenders.get(mbr);
sender.disconnect();
}catch ( Exception e ) {
if ( x == null ) x = new ChannelException(e);
@@ -113,7 +114,7 @@
public void remove(Member member) {
//disconnect senders
- BioSender sender = (BioSender)bioSenders.remove(member);
+ BioSender sender = bioSenders.remove(member);
if ( sender != null ) sender.disconnect();
}
@@ -131,9 +132,9 @@
public boolean keepalive() {
//throw new UnsupportedOperationException("Method
ParallelBioSender.checkKeepAlive() not implemented");
boolean result = false;
- Map.Entry[] entries = (Map.Entry[])bioSenders.entrySet().toArray(new
Map.Entry[bioSenders.size()]);
+ Map.Entry<Member,BioSender>[] entries =
bioSenders.entrySet().toArray(new Map.Entry[bioSenders.size()]);
for ( int i=0; i<entries.length; i++ ) {
- BioSender sender = (BioSender)entries[i].getValue();
+ BioSender sender = entries[i].getValue();
if ( sender.keepalive() ) {
bioSenders.remove(entries[i].getKey());
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java?rev=729323&r1=729322&r2=729323&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
Wed Dec 24 07:59:03 2008
@@ -16,6 +16,7 @@
*/
package org.apache.catalina.tribes.transport.bio;
+import org.apache.catalina.tribes.transport.AbstractSender;
import org.apache.catalina.tribes.transport.DataSender;
import org.apache.catalina.tribes.transport.PooledSender;
import org.apache.catalina.tribes.Member;
@@ -65,7 +66,7 @@
*/
public DataSender getNewDataSender() {
MultipointBioSender sender = new MultipointBioSender();
- sender.transferProperties(this,sender);
+ AbstractSender.transferProperties(this,sender);
return sender;
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java?rev=729323&r1=729322&r2=729323&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
Wed Dec 24 07:59:03 2008
@@ -61,11 +61,7 @@
*/
private boolean checkLock = false;
- /**
- * protocol the thread wait times
- */
- private boolean timeWait = false;
-
+
private boolean inAdd = false;
private boolean inRemove = false;
@@ -99,11 +95,6 @@
private int maxSize = 0;
/**
- * avg size sample interval
- */
- private int sampleInterval = 100;
-
- /**
* Generate Queue SingleRemoveSynchronizedAddLock and set add and wait
* Timeouts
*/
@@ -251,7 +242,6 @@
*/
public boolean add(ChannelMessage msg, Member[] destination,
InterceptorPayload payload) {
boolean ok = true;
- long time = 0;
if (!enabled) {
if (log.isInfoEnabled())
@@ -259,9 +249,6 @@
return false;
}
- if (timeWait) {
- time = System.currentTimeMillis();
- }
lock.lockAdd();
try {
if (log.isTraceEnabled()) {
@@ -327,7 +314,6 @@
public LinkObject remove() {
LinkObject element;
boolean gotLock;
- long time = 0;
if (!enabled) {
if (log.isInfoEnabled())
@@ -335,9 +321,6 @@
return null;
}
- if (timeWait) {
- time = System.currentTimeMillis();
- }
gotLock = lock.lockRemove();
try {
@@ -381,9 +364,6 @@
log.trace("FastQueue.remove: remove ending with size " + size);
}
- if (timeWait) {
- time = System.currentTimeMillis();
- }
} finally {
lock.unlockRemove();
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java?rev=729323&r1=729322&r2=729323&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java
Wed Dec 24 07:59:03 2008
@@ -183,7 +183,7 @@
try {
wait(addWaitTimeout);
} catch ( InterruptedException e ) {
- Thread.currentThread().interrupted();
+ Thread.interrupted();
}
} while ( addLocked || removeLocked );
}
@@ -205,7 +205,7 @@
try {
wait(removeWaitTimeout);
} catch ( InterruptedException e ) {
- Thread.currentThread().interrupted();
+ Thread.interrupted();
}
} while ( ( addLocked || ! dataAvailable ) && removeEnabled );
remover=null;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
