Author: toad
Date: 2007-10-26 16:45:11 +0000 (Fri, 26 Oct 2007)
New Revision: 15579
Modified:
trunk/freenet/src/freenet/node/RequestHandler.java
Log:
more refactoring: pass in opennet manager and invert logic
Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java 2007-10-26 16:42:20 UTC
(rev 15578)
+++ trunk/freenet/src/freenet/node/RequestHandler.java 2007-10-26 16:45:11 UTC
(rev 15579)
@@ -262,17 +262,18 @@
}
private void finishOpennetChecked() {
- if(!(source.isOpennet() ||
- (node.passOpennetRefsThroughDarknet() &&
node.isOpennetEnabled()))) {
- Message msg = DMT.createFNPOpennetCompletedAck(uid);
- try {
- source.sendAsync(msg, null, 0, this);
- } catch (NotConnectedException e) {
- // Oh well...
- }
- return;
+ OpennetManager om = node.getOpennet();
+ if(om != null &&
+ (node.passOpennetRefsThroughDarknet() &&
node.isOpennetEnabled())) {
+ finishOpennetInner(om);
}
- finishOpennetInner();
+
+ Message msg = DMT.createFNPOpennetCompletedAck(uid);
+ try {
+ source.sendAsync(msg, null, 0, this);
+ } catch (NotConnectedException e) {
+ // Oh well...
+ }
}
/**
@@ -295,19 +296,7 @@
}
}
- private void finishOpennetInner() {
- OpennetManager om = node.getOpennet();
-
- if(om == null) {
- Message msg = DMT.createFNPOpennetCompletedAck(uid);
- try {
- source.sendAsync(msg, null, 0, this);
- } catch (NotConnectedException e) {
- // Oh well...
- }
- return;
- }
-
+ private void finishOpennetInner(OpennetManager om) {
byte[] noderef = rs.waitForOpennetNoderef();
if(noderef == null) {
if(!finishOpennetNoRelayInner(om)) {
