Update of /cvsroot/freenet/freenet/src/freenet/node/states/FNP
In directory sc8-pr-cvs1:/tmp/cvs-serv16939/src/freenet/node/states/FNP
Modified Files:
NewDataRequest.java NewInsertRequest.java
Log Message:
get rid of some yellowies
Index: NewDataRequest.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FNP/NewDataRequest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- NewDataRequest.java 17 Oct 2003 23:02:00 -0000 1.7
+++ NewDataRequest.java 31 Oct 2003 19:32:17 -0000 1.8
@@ -33,8 +33,8 @@
genReceived(n, drmo, true);
// Run the request even if we cannot send the accepted back
// This is not an attack IMHO because of the overhead of connecting
- if (n.requestDataDistribution != null) {
- n.requestDataDistribution.add(drmo.searchKey.getVal());
+ if (Core.requestDataDistribution != null) {
+ Core.requestDataDistribution.add(drmo.searchKey.getVal());
}
FeedbackToken ft = new FNPFeedbackToken(id, origRec,
@@ -43,7 +43,7 @@
drmo.getReceivedTime());
Pending p = new DataPending(id, (int) drmo.hopsToLive,
drmo.searchKey, origRec, ft, ri);
- n.diagnostics.occurrenceCounting("incomingRequests", 1);
+ Core.diagnostics.occurrenceCounting("incomingRequests", 1);
return p.received(n, ri);
} catch (RequestAbortException e) {
return e.state;
Index: NewInsertRequest.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FNP/NewInsertRequest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- NewInsertRequest.java 17 Oct 2003 23:02:00 -0000 1.7
+++ NewInsertRequest.java 31 Oct 2003 19:32:17 -0000 1.8
@@ -32,8 +32,8 @@
try {
genReceived(n, irmo, false);
// no point continuing if can't send Accepted back
- if (n.requestInsertDistribution != null) {
- n.requestInsertDistribution.add(irmo.searchKey.getVal());
+ if (Core.requestInsertDistribution != null) {
+ Core.requestInsertDistribution.add(irmo.searchKey.getVal());
}
FeedbackToken ft = new FNPFeedbackToken(id, origRec,
@@ -42,7 +42,7 @@
irmo.getReceivedTime());
Pending p = new InsertPending(id, (int) irmo.hopsToLive,
irmo.searchKey, origRec, ft, ri);
- n.diagnostics.occurrenceCounting("incomingInserts", 1);
+ Core.diagnostics.occurrenceCounting("incomingInserts", 1);
return p.received(n, ri);
} catch (RequestAbortException rae) {
return rae.state;
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
