From 7e12da357c5b8a6e38df65da513581245043fd58 Mon Sep 17 00:00:00 2001
From: Mike Hearn <mike@plan99.net>
Date: Fri, 13 Mar 2015 18:00:05 -0700
Subject: [PATCH] Undo the memory usage optimisation for scriptPubKey parsing
 on Android to see if CPU time now matters more than memory (especially when
 combined with the wallet unspents tracking work).

---
 .../org/bitcoinj/core/TransactionOutput.java  | 32 ++++++-------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/core/src/main/java/org/bitcoinj/core/TransactionOutput.java b/core/src/main/java/org/bitcoinj/core/TransactionOutput.java
index 7f8afa8f..ac2daf01 100644
--- a/core/src/main/java/org/bitcoinj/core/TransactionOutput.java
+++ b/core/src/main/java/org/bitcoinj/core/TransactionOutput.java
@@ -17,20 +17,12 @@
 
 package org.bitcoinj.core;
 
-import org.bitcoinj.script.Script;
-import org.bitcoinj.script.ScriptBuilder;
+import org.bitcoinj.script.*;
+import org.slf4j.*;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.annotation.Nullable;
-
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.lang.ref.WeakReference;
-import java.util.Arrays;
+import javax.annotation.*;
+import java.io.*;
+import java.util.*;
 
 import static com.google.common.base.Preconditions.*;
 
@@ -50,7 +42,7 @@ public class TransactionOutput extends ChildMessage implements Serializable {
     private byte[] scriptBytes;
 
     // The script bytes are parsed and turned into a Script on demand.
-    private transient WeakReference<Script> scriptPubKey;
+    private transient Script scriptPubKey;
 
     // These fields are Java serialized but not Bitcoin serialized. They are used for tracking purposes in our wallet
     // only. If set to true, this output is counted towards our balance. If false and spentBy is null the tx output
@@ -121,17 +113,11 @@ public class TransactionOutput extends ChildMessage implements Serializable {
     }
 
     public Script getScriptPubKey() throws ScriptException {
-        // Quick hack to try and reduce memory consumption on Androids. SoftReference is the same as WeakReference
-        // on Dalvik (by design), so this arrangement just means that we can avoid the cost of re-parsing the script
-        // bytes if getScriptPubKey is called multiple times in quick succession in between garbage collections.
-        Script script = scriptPubKey == null ? null : scriptPubKey.get();
-        if (script == null) {
+        if (scriptPubKey == null) {
             maybeParse();
-            script = new Script(scriptBytes);
-            scriptPubKey = new WeakReference<Script>(script);
-            return script;
+            scriptPubKey = new Script(scriptBytes);
         }
-        return script;
+        return scriptPubKey;
     }
 
     /**