Merge "CMFM: Fix sync object" into cm-10.1

CyanogenMod · Jan 7, 2013 · 6e8dd09 · 6e8dd09
2 parents 870edd4 + 0f6534b
commit 6e8dd09
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/src/com/cyanogenmod/filemanager/commands/shell/AsyncResultProgram.java b/src/com/cyanogenmod/filemanager/commands/shell/AsyncResultProgram.java
@@ -51,7 +51,7 @@ public abstract class AsyncResultProgram
      * @hide
      */
     final List<Byte> mPartialDataType;
-    private final Object mSync = new Object();
+    final Object mSync = new Object();
     /**
      * @hide
      */
@@ -106,7 +106,7 @@ public AsyncResultProgram(
      * @hide
      */
     public final void onRequestStartParsePartialResult() {
-        this.mWorkerThread = new AsyncResultProgramThread(this.mSync);
+        this.mWorkerThread = new AsyncResultProgramThread();
         this.mWorkerThread.start();
 
         //Notify start to command class
@@ -132,7 +132,7 @@ public final void onRequestEndParsePartialResult(boolean cancelled) {
         }
         synchronized (this.mTerminateSync) {
             try {
-                this.mSync.wait();
+                this.mTerminateSync.wait();
             } catch (Exception e) {
                 /**NON BLOCK**/
             }
@@ -353,16 +353,12 @@ public boolean isExpectEnd() {
      */
     private class AsyncResultProgramThread extends Thread {
         boolean mAlive = true;
-        private final Object mSyncObj;
 
         /**
          * Constructor of <code>AsyncResultProgramThread</code>.
-         *
-         * @param sync The synchronized object
          */
-        AsyncResultProgramThread(Object sync) {
+        AsyncResultProgramThread() {
             super();
-            this.mSyncObj = sync;
         }
 
         /**
@@ -373,8 +369,8 @@ public void run() {
             try {
                 this.mAlive = true;
                 while (this.mAlive) {
-                   synchronized (this.mSyncObj) {
-                       this.mSyncObj.wait();
+                   synchronized (AsyncResultProgram.this.mSync) {
+                       AsyncResultProgram.this.mSync.wait();
                        while (AsyncResultProgram.this.mPartialData.size() > 0) {
                            if (!this.mAlive) {
                                return;