Author: toad
Date: 2008-12-23 16:45:22 +0000 (Tue, 23 Dec 2008)
New Revision: 24777
Modified:
branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java
Log:
Fix more NPEs
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-12-23
16:29:22 UTC (rev 24776)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-12-23
16:45:22 UTC (rev 24777)
@@ -430,7 +430,8 @@
container.store(this);
}
finish(container);
- client.notifySuccess(this, container);
+ if(client != null)
+ client.notifySuccess(this, container);
}
private void trySendDataFoundOrGetFailed(FCPConnectionOutputHandler
handler, ObjectContainer container) {
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java
2008-12-23 16:29:22 UTC (rev 24776)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java
2008-12-23 16:45:22 UTC (rev 24777)
@@ -161,7 +161,8 @@
freeData(container);
finish(container);
trySendFinalMessage(null, container);
- client.notifyFailure(this, container);
+ if(client != null)
+ client.notifyFailure(this, container);
}
public void onGeneratedURI(FreenetURI uri, BaseClientPutter state,
ObjectContainer container) {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
