Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-08-01 12:31:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add synchronized to a couple of methods. Bit more style consistency in Wallet.

Browse Source
This commit is contained in:
Mike Hearn
2011-03-27 21:16:16 +00:00
parent a9d3ca45e5
commit ce927609ba
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/google/bitcoin/core/Wallet.java
View File

@@ -53,6 +53,7 @@ public class Wallet implements Serializable {
/** A list of public/private EC keys owned by this user. */ /** A list of public/private EC keys owned by this user. */
public final ArrayList<ECKey> keychain; public final ArrayList<ECKey> keychain;
private final NetworkParameters params; private final NetworkParameters params;
transient private ArrayList<WalletEventListener> eventListeners; transient private ArrayList<WalletEventListener> eventListeners;
@@ -81,7 +82,7 @@ public class Wallet implements Serializable {
/** /**
* Returns a wallet deserialized from the given file. * Returns a wallet deserialized from the given file.
*/ */
static public Wallet loadFromFile(File f) throws IOException { public static Wallet loadFromFile(File f) throws IOException {
ObjectInputStream ois = null; ObjectInputStream ois = null;
try { try {
ois = new ObjectInputStream(new FileInputStream(f)); ois = new ObjectInputStream(new FileInputStream(f));
@@ -351,7 +352,7 @@ public class Wallet implements Serializable {
} }
@Override @Override
public String toString() { public synchronized String toString() {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.append("Wallet containing "); builder.append("Wallet containing ");
builder.append(Utils.bitcoinValueToFriendlyString(getBalance())); builder.append(Utils.bitcoinValueToFriendlyString(getBalance()));
@@ -378,7 +379,7 @@ public class Wallet implements Serializable {
* to go down in this case: money we thought we had can suddenly vanish if the rest of the network agrees it * to go down in this case: money we thought we had can suddenly vanish if the rest of the network agrees it
* should be so. * should be so.
*/ */
void reorganize(StoredBlock chainHead, StoredBlock newStoredBlock) { synchronized void reorganize(StoredBlock chainHead, StoredBlock newStoredBlock) {
// This runs on any peer thread with the block chain synchronized. Thus we do not have to worry about it // This runs on any peer thread with the block chain synchronized. Thus we do not have to worry about it
// being called simultaneously or repeatedly. // being called simultaneously or repeatedly.
LOG("Re-organize!"); LOG("Re-organize!");