Update of /cvsroot/freenet/freenet/src/freenet/client
In directory sc8-pr-cvs1:/tmp/cvs-serv5586/src/freenet/client
Modified Files:
ClientCore.java InternalClient.java FNPClient.java
Log Message:
Work around problem with ThrottleAsyncEntropyYarrow/Yarrow initialization order.
Made randSource in Core private and started exposing it though a getter instead of
directly.
Index: ClientCore.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/ClientCore.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- ClientCore.java 28 Oct 2002 00:42:56 -0000 1.4
+++ ClientCore.java 27 Oct 2003 14:45:18 -0000 1.5
@@ -45,7 +45,7 @@
throws ListenException {
DSAAuthentity auth = new DSAAuthentity(Global.DSAgroupC,
- Core.randSource);
+ Core.getRandSource());
return newInstance(auth, myAddress, lm, p);
}
Index: InternalClient.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/InternalClient.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -w -r1.29 -r1.30
--- InternalClient.java 6 Oct 2003 15:20:17 -0000 1.29
+++ InternalClient.java 27 Oct 2003 14:45:18 -0000 1.30
@@ -30,7 +30,7 @@
if(node == null)
throw new IllegalArgumentException("null node pointer to "+
"InternalClient");
- vc = new VirtualClient(node, node.randSource, node.bf);
+ vc = new VirtualClient(node, node.getRandSource(), node.bf);
}
public boolean isOverloaded() {
@@ -45,13 +45,13 @@
IOException, KeyException {
if (req instanceof GetRequest) {
return new ClientMessageVector(
- new NewInternalGet(node.randSource.nextLong(),
+ new NewInternalGet(node.getRandSource().nextLong(),
new InternalGetToken((GetRequest) req))
);
}
else if (req instanceof PutRequest) {
return new ClientMessageVector(
- new NewInternalPut(node.randSource.nextLong(),
+ new NewInternalPut(node.getRandSource().nextLong(),
new InternalPutToken((PutRequest) req))
);
}
@@ -556,7 +556,7 @@
this.ft = ft;
// set up ClientKey
- ft.clientKey = AbstractClientKey.createFromInsertURI(node.randSource,
ft.req.uri);
+ ft.clientKey =
AbstractClientKey.createFromInsertURI(node.getRandSource(), ft.req.uri);
try {
ft.clientKey.setCipher(ft.req.cipherName);
}
Index: FNPClient.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/FNPClient.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- FNPClient.java 17 Oct 2003 23:01:59 -0000 1.10
+++ FNPClient.java 27 Oct 2003 14:45:18 -0000 1.11
@@ -51,7 +51,7 @@
protected FNPClient(ClientCore core, BucketFactory ctBuckets) {
this.core = core;
this.ctBuckets = ctBuckets;
- vc = new VirtualClient(null, core.randSource, ctBuckets);
+ vc = new VirtualClient(null, core.getRandSource(), ctBuckets);
}
protected FNPClient(ClientCore core) {
@@ -102,7 +102,7 @@
BInstance(Request req) throws KeyException {
this.req = req;
- id = core.randSource.nextLong();
+ id = core.getRandSource().nextLong();
}
public final void start() {
@@ -371,7 +371,7 @@
super(req);
this.req = req;
- ckey = AbstractClientKey.createFromInsertURI(core.randSource,
+ ckey = AbstractClientKey.createFromInsertURI(core.getRandSource(),
req.uri);
try {
ckey.setCipher(req.cipherName);
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
