Author: nextgens
Date: 2006-10-29 18:01:55 +0000 (Sun, 29 Oct 2006)
New Revision: 10739
Modified:
trunk/freenet/src/freenet/node/fcp/ClientGet.java
trunk/freenet/src/freenet/node/fcp/ClientPut.java
trunk/freenet/src/freenet/node/fcp/ClientPutBase.java
trunk/freenet/src/freenet/node/fcp/ClientPutDir.java
Log:
* Add a synchronization on GeneratedURI
* Code cleanup
* Enforce the overriding of onSuccess and onFailure declarating them
abstract
Modified: trunk/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGet.java 2006-10-29 17:48:23 UTC
(rev 10738)
+++ trunk/freenet/src/freenet/node/fcp/ClientGet.java 2006-10-29 18:01:55 UTC
(rev 10739)
@@ -53,7 +53,7 @@
/** Length of the found data */
private long foundDataLength = -1;
/** MIME type of the found data */
- private String foundDataMimeType = null;
+ private String foundDataMimeType;
/** Details of request failure */
private GetFailedMessage getFailedMessage;
/** Succeeded but failed to return data e.g. couldn't write to file */
@@ -312,8 +312,10 @@
if(persistenceType == PERSIST_CONNECTION)
adm.setFreeOnSent();
dontFree = true;
- } else if(returnType ==
ClientGetMessage.RETURN_TYPE_NONE) {
+ /*
+ * } else if(returnType ==
ClientGetMessage.RETURN_TYPE_NONE) {
// Do nothing
+ */
} else if(returnType ==
ClientGetMessage.RETURN_TYPE_DISK) {
// Write to temp file, then rename over filename
FileOutputStream fos = null;
Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPut.java 2006-10-29 17:48:23 UTC
(rev 10738)
+++ trunk/freenet/src/freenet/node/fcp/ClientPut.java 2006-10-29 18:01:55 UTC
(rev 10739)
@@ -8,9 +8,12 @@
import freenet.client.ClientMetadata;
import freenet.client.DefaultMIMETypes;
+import freenet.client.FetchException;
+import freenet.client.FetchResult;
import freenet.client.InserterException;
import freenet.client.Metadata;
import freenet.client.MetadataUnresolvedException;
+import freenet.client.async.ClientGetter;
import freenet.client.async.ClientPutter;
import freenet.keys.FreenetURI;
import freenet.support.HexUtil;
@@ -395,4 +398,7 @@
}
}
+ public void onFailure(FetchException e, ClientGetter state) {}
+
+ public void onSuccess(FetchResult result, ClientGetter state) {}
}
Modified: trunk/freenet/src/freenet/node/fcp/ClientPutBase.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutBase.java 2006-10-29
17:48:23 UTC (rev 10738)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutBase.java 2006-10-29
18:01:55 UTC (rev 10739)
@@ -2,13 +2,10 @@
import java.net.MalformedURLException;
-import freenet.client.FetchException;
-import freenet.client.FetchResult;
import freenet.client.InserterContext;
import freenet.client.InserterException;
import freenet.client.async.BaseClientPutter;
import freenet.client.async.ClientCallback;
-import freenet.client.async.ClientGetter;
import freenet.client.events.ClientEvent;
import freenet.client.events.ClientEventListener;
import freenet.client.events.FinishedCompressionEvent;
@@ -138,10 +135,6 @@
trySendGeneratedURIMessage(null);
}
- public void onSuccess(FetchResult result, ClientGetter state){}
-
- public void onFailure(FetchException e, ClientGetter state){}
-
public void receive(ClientEvent ce) {
if(finished) return;
if(ce instanceof SplitfileProgressEvent) {
@@ -168,8 +161,12 @@
public void onFetchable(BaseClientPutter putter) {
if(finished) return;
if((verbosity & VERBOSITY_PUT_FETCHABLE) ==
VERBOSITY_PUT_FETCHABLE) {
+ FreenetURI temp;
+ synchronized (this) {
+ temp = generatedURI;
+ }
PutFetchableMessage msg =
- new PutFetchableMessage(identifier,
generatedURI);
+ new PutFetchableMessage(identifier, temp);
trySendProgressMessage(msg, VERBOSITY_PUT_FETCHABLE,
null);
}
}
Modified: trunk/freenet/src/freenet/node/fcp/ClientPutDir.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutDir.java 2006-10-29
17:48:23 UTC (rev 10738)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutDir.java 2006-10-29
18:01:55 UTC (rev 10739)
@@ -9,12 +9,13 @@
import java.util.Iterator;
import java.util.Vector;
+import freenet.client.FetchException;
+import freenet.client.FetchResult;
import freenet.client.InserterException;
-import freenet.client.async.ClientCallback;
+import freenet.client.async.ClientGetter;
import freenet.client.async.ClientRequester;
import freenet.client.async.ManifestElement;
import freenet.client.async.SimpleManifestPutter;
-import freenet.client.events.ClientEventListener;
import freenet.keys.FreenetURI;
import freenet.support.HexUtil;
import freenet.support.Logger;
@@ -23,7 +24,7 @@
import freenet.support.io.FileBucket;
import freenet.support.io.PaddedEphemerallyEncryptedBucket;
-public class ClientPutDir extends ClientPutBase implements
ClientEventListener, ClientCallback {
+public class ClientPutDir extends ClientPutBase {
private final HashMap manifestElements;
private SimpleManifestPutter putter;
@@ -291,4 +292,7 @@
return true;
}
+ public void onFailure(FetchException e, ClientGetter state) {}
+
+ public void onSuccess(FetchResult result, ClientGetter state) {}
}
