Update of /cvsroot/freenet/freenet/src/freenet/node/states/request
In directory sc8-pr-cvs1:/tmp/cvs-serv16347/src/freenet/node/states/request
Modified Files:
AwaitingStoreData.java SendingReply.java SendFinished.java
ReceivingInsert.java RequestDone.java
Log Message:
get rid of some yellowies
Index: AwaitingStoreData.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/request/AwaitingStoreData.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -w -r1.27 -r1.28
--- AwaitingStoreData.java 31 Oct 2003 19:21:17 -0000 1.27
+++ AwaitingStoreData.java 31 Oct 2003 19:29:21 -0000 1.28
@@ -102,7 +102,7 @@
}
NodeReference nr = (sd == null ? null : sd.dataSource());
if (nr != null && !nr.checkAddresses(n.transports)) {
- if (n.logger.shouldLog(Logger.MINOR))
+ if (Core.logger.shouldLog(Logger.MINOR))
Core.logger.log(this,
"Not referencing because addresses "
+ "of DataSource wrong: "
@@ -111,31 +111,31 @@
}
long rate = -1;
if(sd != null)
- n.diagnostics.occurrenceContinuous("incomingHopsSinceReset",
+ Core.diagnostics.occurrenceContinuous("incomingHopsSinceReset",
sd.hopsSinceReset());
if (n.shouldReference(nr, sd)) {
- n.diagnostics.occurrenceCounting("prefAccepted", 1);
+ Core.diagnostics.occurrenceCounting("prefAccepted", 1);
Core.logger.log(this, "PCaching: Referencing "+searchKey, Logger.DEBUG);
n.reference(searchKey, nr);
rate = sd.requestsPerHour();
} else if(nr != null) {
- n.diagnostics.occurrenceCounting("prefRejected", 1);
+ Core.diagnostics.occurrenceCounting("prefRejected", 1);
Core.logger.log(this, "PCaching: Not Referencing "+searchKey,
Logger.DEBUG);
}
if(n.shouldCache(sd)) {
Core.logger.log(this, "PCaching: Keeping "+searchKey, Logger.DEBUG);
- n.diagnostics.occurrenceCounting("pcacheAccepted", 1);
+ Core.diagnostics.occurrenceCounting("pcacheAccepted", 1);
// Keep it
} else {
// Try to delete it
Core.logger.log(this, "PCaching: Removing "+searchKey, Logger.DEBUG);
- n.diagnostics.occurrenceCounting("pcacheRejected", 1);
+ Core.diagnostics.occurrenceCounting("pcacheRejected", 1);
if(!n.ds.demote(searchKey))
- n.diagnostics.occurrenceCounting("pcacheFailedDelete", 1);
+ Core.diagnostics.occurrenceCounting("pcacheFailedDelete", 1);
}
try {
- n.diagnostics.occurrenceCounting("storeDataAwaitingStoreData",1);
+ Core.diagnostics.occurrenceCounting("storeDataAwaitingStoreData",1);
ft.storeData(n, nr, rate, sd == null ? 0 : sd.hopsSinceReset(),
new RequestSendCallback("StoreData", n, this));
} catch (CommunicationException e) {
@@ -146,16 +146,16 @@
Core.logger.log(this, "Logging external success on success*Distribution "+
"from "+origPeer+" on "+this, Logger.DEBUG);
if (isInsert) {
- if (n.successInsertDistribution != null) {
- n.successInsertDistribution.add(searchKey.getVal());
+ if (Node.successInsertDistribution != null) {
+ Node.successInsertDistribution.add(searchKey.getVal());
}
} else {
- if (n.successDataDistribution != null) {
- n.successDataDistribution.add(searchKey.getVal());
+ if (Node.successDataDistribution != null) {
+ Node.successDataDistribution.add(searchKey.getVal());
}
}
- if (n.inboundRequests != null)
- n.inboundRequests.incActive(origPeer.getAddress().toString());
+ if (Node.inboundRequests != null)
+ Node.inboundRequests.incActive(origPeer.getAddress().toString());
}
}
}
Index: SendingReply.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/SendingReply.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -w -r1.25 -r1.26
--- SendingReply.java 31 Oct 2003 19:21:17 -0000 1.25
+++ SendingReply.java 31 Oct 2003 19:29:21 -0000 1.26
@@ -75,11 +75,11 @@
Core.logger.log(this, "Logging external success on "+
"success*Distribution from "+origPeer+" on "+
this, Logger.DEBUG);
- if (n.successDataDistribution != null) {
- n.successDataDistribution.add(searchKey.getVal());
+ if (Core.successDataDistribution != null) {
+ Core.successDataDistribution.add(searchKey.getVal());
}
- if(n.inboundRequests != null)
- n.inboundRequests.incActive(origPeer.getAddress().toString());
+ if(Core.inboundRequests != null)
+
Core.inboundRequests.incActive(origPeer.getAddress().toString());
}
Core.logger.log(this, "Finalizing sendingData: "+this, Logger.DEBUG);
sendingData.finalize();
Index: SendFinished.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/SendFinished.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- SendFinished.java 31 Oct 2003 19:21:17 -0000 1.12
+++ SendFinished.java 31 Oct 2003 19:29:21 -0000 1.13
@@ -68,7 +68,7 @@
public void succeeded() {
finishTime = System.currentTimeMillis();
succeeded = true;
- if(n.logger.shouldLog(Logger.DEBUG,this))
+ if(Core.logger.shouldLog(Logger.DEBUG,this))
Core.logger.log(this, toString() + " succeeded",
Logger.DEBUG);
if(mustHaveSucceededTime != -1 &&
@@ -102,7 +102,7 @@
}
public final State getInitialState() {
- if(n.logger.shouldLog(Logger.DEBUG,this))
+ if(Core.logger.shouldLog(Logger.DEBUG,this))
Core.logger.log(this, "getInitialState() called on "+this,
new Exception("debug"),
Logger.DEBUG);
Index: ReceivingInsert.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/request/ReceivingInsert.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -w -r1.25 -r1.26
--- ReceivingInsert.java 31 Oct 2003 19:21:17 -0000 1.25
+++ ReceivingInsert.java 31 Oct 2003 19:29:21 -0000 1.26
@@ -93,11 +93,11 @@
{
if (Node.successInsertDistribution != null)
{
- n.successInsertDistribution.add(searchKey.getVal());
+ Node.successInsertDistribution.add(searchKey.getVal());
}
- if (n.inboundRequests != null)
+ if (Node.inboundRequests != null)
{
-
n.inboundRequests.incActive(origPeer.getAddress().toString());
+
Node.inboundRequests.incActive(origPeer.getAddress().toString());
}
}
} catch (CommunicationException e) {
Index: RequestDone.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/RequestDone.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- RequestDone.java 31 Oct 2003 19:21:17 -0000 1.7
+++ RequestDone.java 31 Oct 2003 19:29:21 -0000 1.8
@@ -32,7 +32,7 @@
// DataReply..
public State received(Node n, MessageObject mo) throws BadStateException {
- logDEBUG = n.logger.shouldLog(Logger.DEBUG,this);
+ logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this);
if (mo instanceof Accepted) {
return this;
} else if (mo instanceof DataInsert
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
