Author: toad
Date: 2007-10-26 16:36:30 +0000 (Fri, 26 Oct 2007)
New Revision: 15574
Modified:
trunk/freenet/src/freenet/node/RequestHandler.java
Log:
simplify logic
Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java 2007-10-26 16:34:51 UTC
(rev 15573)
+++ trunk/freenet/src/freenet/node/RequestHandler.java 2007-10-26 16:36:30 UTC
(rev 15574)
@@ -278,23 +278,17 @@
private void finishOpennetNoRelay() {
OpennetManager om = node.getOpennet();
- if(om == null || !(source.isOpennet() ||
node.passOpennetRefsThroughDarknet())) {
- Message msg = DMT.createFNPOpennetCompletedAck(uid);
- try {
- source.sendAsync(msg, null, 0, this);
- } catch (NotConnectedException e) {
- // Oh well...
+ if(!(om == null || !(source.isOpennet() ||
node.passOpennetRefsThroughDarknet()))) {
+ if(finishOpennetNoRelayInner(om)) {
+ return;
}
- return;
- } else if(!finishOpennetNoRelayInner(om)) {
- Message msg = DMT.createFNPOpennetCompletedAck(uid);
- try {
- source.sendAsync(msg, null, 0, this);
- } catch (NotConnectedException e) {
- // Oh well...
- }
- return;
}
+ Message msg = DMT.createFNPOpennetCompletedAck(uid);
+ try {
+ source.sendAsync(msg, null, 0, this);
+ } catch (NotConnectedException e) {
+ // Oh well...
+ }
}
private void finishOpennetInner() {
