Author: toad
Date: 2007-05-30 20:51:48 +0000 (Wed, 30 May 2007)
New Revision: 13401
Modified:
trunk/freenet/src/freenet/io/comm/UdpSocketManager.java
trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
trunk/freenet/src/freenet/node/NodeDispatcher.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Remove (PeerNode) casts to use sendAsync()
Modified: trunk/freenet/src/freenet/io/comm/UdpSocketManager.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/UdpSocketManager.java 2007-05-30
20:39:21 UTC (rev 13400)
+++ trunk/freenet/src/freenet/io/comm/UdpSocketManager.java 2007-05-30
20:51:48 UTC (rev 13401)
@@ -577,7 +577,7 @@
// } else {
// sendPacket(blockToSend, destination.getPeer());
// }
- ((PeerNode)destination).sendAsync(m, null, 0, ctr);
+ destination.sendAsync(m, null, 0, ctr);
}
/**
Modified: trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java 2007-05-30
20:39:21 UTC (rev 13400)
+++ trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java 2007-05-30
20:51:48 UTC (rev 13401)
@@ -118,7 +118,7 @@
if(_sendComplete) break;
_sentPackets.setBit(packetNo, true);
try {
-
((PeerNode)_destination).sendAsync(DMT.createPacketTransmit(_uid, packetNo,
_sentPackets, _prb.getPacket(packetNo)), null, PACKET_SIZE, _ctr);
+
_destination.sendAsync(DMT.createPacketTransmit(_uid, packetNo, _sentPackets,
_prb.getPacket(packetNo)), null, PACKET_SIZE, _ctr);
_ctr.sentPayload(PACKET_SIZE);
} catch (NotConnectedException e) {
Logger.normal(this,
"Terminating send: "+e);
@@ -198,7 +198,7 @@
public void receiveAborted(int reason,
String description) {
try {
-
((PeerNode)_destination).sendAsync(DMT.createSendAborted(_uid, reason,
description), null, 0, _ctr);
+
_destination.sendAsync(DMT.createSendAborted(_uid, reason, description), null,
0, _ctr);
} catch (NotConnectedException
e) {
if(Logger.shouldLog(Logger.MINOR, this))
Logger.minor(this, "Receive aborted and receiver is not connected");
Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java 2007-05-30 20:39:21 UTC
(rev 13400)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java 2007-05-30 20:51:48 UTC
(rev 13401)
@@ -57,7 +57,7 @@
// Send an FNPPong
Message reply =
DMT.createFNPPong(m.getInt(DMT.PING_SEQNO));
try {
- ((PeerNode)m.getSource()).sendAsync(reply,
null, 0, null); // nothing we can do if can't contact source
+ m.getSource().sendAsync(reply, null, 0, null);
// nothing we can do if can't contact source
} catch (NotConnectedException e) {
if(logMINOR) Logger.minor(this, "Lost
connection replying to "+m);
}
@@ -140,7 +140,7 @@
if(node.recentlyCompleted(id)) {
Message rejected = DMT.createFNPRejectedLoop(id);
try {
- ((PeerNode)(m.getSource())).sendAsync(rejected,
null, 0, null);
+ m.getSource().sendAsync(rejected, null, 0,
null);
} catch (NotConnectedException e) {
Logger.normal(this, "Rejecting data request
(loop, finished): "+e);
}
@@ -150,7 +150,7 @@
if(logMINOR) Logger.minor(this, "Could not lock ID
"+id+" -> rejecting (already running)");
Message rejected = DMT.createFNPRejectedLoop(id);
try {
- ((PeerNode)(m.getSource())).sendAsync(rejected,
null, 0, null);
+ m.getSource().sendAsync(rejected, null, 0,
null);
} catch (NotConnectedException e) {
Logger.normal(this, "Rejecting insert request
from "+m.getSource().getPeer()+": "+e);
}
@@ -164,7 +164,7 @@
Logger.normal(this, "Rejecting request from
"+m.getSource().getPeer()+" preemptively because "+rejectReason);
Message rejected = DMT.createFNPRejectedOverload(id,
true);
try {
- ((PeerNode)(m.getSource())).sendAsync(rejected,
null, 0, null);
+ m.getSource().sendAsync(rejected, null, 0,
null);
} catch (NotConnectedException e) {
Logger.normal(this, "Rejecting (overload) data
request from "+m.getSource().getPeer()+": "+e);
}
@@ -184,7 +184,7 @@
if(node.recentlyCompleted(id)) {
Message rejected = DMT.createFNPRejectedLoop(id);
try {
- ((PeerNode)(m.getSource())).sendAsync(rejected,
null, 0, null);
+ m.getSource().sendAsync(rejected, null, 0,
null);
} catch (NotConnectedException e) {
Logger.normal(this, "Rejecting insert request
from "+m.getSource().getPeer()+": "+e);
}
@@ -194,7 +194,7 @@
if(logMINOR) Logger.minor(this, "Could not lock ID
"+id+" -> rejecting (already running)");
Message rejected = DMT.createFNPRejectedLoop(id);
try {
- ((PeerNode)(m.getSource())).sendAsync(rejected,
null, 0, null);
+ m.getSource().sendAsync(rejected, null, 0,
null);
} catch (NotConnectedException e) {
Logger.normal(this, "Rejecting insert request
from "+m.getSource().getPeer()+": "+e);
}
@@ -206,7 +206,7 @@
Logger.normal(this, "Rejecting insert from
"+m.getSource().getPeer()+" preemptively because "+rejectReason);
Message rejected = DMT.createFNPRejectedOverload(id,
true);
try {
- ((PeerNode)(m.getSource())).sendAsync(rejected,
null, 0, null);
+ m.getSource().sendAsync(rejected, null, 0,
null);
} catch (NotConnectedException e) {
Logger.normal(this, "Rejecting (overload)
insert request from "+m.getSource().getPeer()+": "+e);
}
@@ -296,7 +296,7 @@
ctx = (RoutedContext)routedContexts.get(lid);
if(ctx != null) {
try {
-
((PeerNode)m.getSource()).sendAsync(DMT.createFNPRoutedRejected(id,
(short)(htl-1)), null, 0, null);
+
m.getSource().sendAsync(DMT.createFNPRoutedRejected(id, (short)(htl-1)), null,
0, null);
} catch (NotConnectedException e) {
if(logMINOR) Logger.minor(this, "Lost
connection rejecting "+m);
}
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2007-05-30 20:39:21 UTC
(rev 13400)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2007-05-30 20:51:48 UTC
(rev 13401)
@@ -1261,7 +1261,7 @@
}
}
SyncMessageCallback cb = new SyncMessageCallback();
- this.sendAsync(req, cb, 0, ctr);
+ sendAsync(req, cb, 0, ctr);
cb.waitForSend(60*1000);
}
