Update of /cvsroot/freenet/freenet/src/freenet/message
In directory sc8-pr-cvs1:/tmp/cvs-serv14016/src/freenet/message
Modified Files:
VoidMessage.java DataSend.java
Log Message:
6290: don't show the request box either when in simple mode.
Index: VoidMessage.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/VoidMessage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- VoidMessage.java 24 Oct 2003 02:24:58 -0000 1.4
+++ VoidMessage.java 31 Oct 2003 19:21:20 -0000 1.5
@@ -4,6 +4,8 @@
import freenet.node.*;
import java.io.InputStream;
import java.io.IOException;
+
+import freenet.support.Logger;
import freenet.support.io.ZeroInputStream;
/**
@@ -103,8 +105,8 @@
if (data != null)
data.close();
} catch (IOException e) {
- n.logger.log(this, "Closing dropped DataSend threw exception :"
- + e, n.logger.DEBUGGING);
+ Core.logger.log(this, "Closing dropped DataSend threw exception :"
+ + e, Logger.DEBUGGING);
}
}
}
Index: DataSend.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/DataSend.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- DataSend.java 30 Oct 2003 01:34:02 -0000 1.12
+++ DataSend.java 31 Oct 2003 19:21:20 -0000 1.13
@@ -149,7 +149,7 @@
VerifyingInputStream vis = searchKey.verifyStream(in, storables, length);
if(logDEBUG)
Core.logger.log(this, "Trying to cache data: "+searchKey+":"+length+
- ":"+in, Core.logger.DEBUG);
+ ":"+in, Logger.DEBUG);
KeyOutputStream out;
try {
out = n.ds.putData(searchKey, length, storables);
@@ -157,7 +157,7 @@
if(e instanceof StoreIOException) throw e;
else throw new StoreIOException(e);
}
- return new ReceiveData(n.getRandSource().nextLong(), this.id, vis, out,
length);
+ return new ReceiveData(Core.getRandSource().nextLong(), this.id, vis, out,
length);
}
/** Used to swallow a DataInsert.
@@ -168,7 +168,7 @@
Storables storables = getStorables();
if (storables == null) throw new IOException();
VerifyingInputStream vin = new VerifyingInputStream(in, length);
- (new EatData(n.getRandSource().nextLong(), vin, length)).schedule(n);
+ (new EatData(Core.getRandSource().nextLong(), vin, length)).schedule(n);
// FIXME -- should use ControlInputStream but i haven't made
// sure it will work yet
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
