Author: toad
Date: 2008-12-18 00:30:02 +0000 (Thu, 18 Dec 2008)
New Revision: 24499
Modified:
branches/db4o/freenet/src/freenet/keys/ClientSSKBlock.java
Log:
block.getPubKey() cannot be null
Modified: branches/db4o/freenet/src/freenet/keys/ClientSSKBlock.java
===================================================================
--- branches/db4o/freenet/src/freenet/keys/ClientSSKBlock.java 2008-12-18
00:28:29 UTC (rev 24498)
+++ branches/db4o/freenet/src/freenet/keys/ClientSSKBlock.java 2008-12-18
00:30:02 UTC (rev 24499)
@@ -39,7 +39,7 @@
public static ClientSSKBlock construct(SSKBlock block, ClientSSK key)
throws SSKVerifyException {
// Constructor expects clientkey to have the pubkey.
// In the case of binary blobs, the block may have it instead.
- if(key.getPubKey() == null && block.getPubKey() != null)
+ if(key.getPubKey() == null)
key.setPublicKey(block.getPubKey());
return new ClientSSKBlock(block.data, block.headers, key,
false);
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
