优化几处锁条件处理

Gufra-Ycy · Mar 19, 2017 · 9d82db6 · 9d82db6
1 parent cc25f47
commit 9d82db6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/xutils/src/main/java/org/xutils/http/HttpTask.java b/xutils/src/main/java/org/xutils/http/HttpTask.java
@@ -250,8 +250,8 @@ protected ResultType doBackground() throws Throwable {
                 if (cacheResult != null) {
                     // 同步等待是否信任缓存
                     this.update(FLAG_CACHE, cacheResult);
-                    while (trustCache == null) {
-                        synchronized (cacheLock) {
+                    synchronized (cacheLock) {
+                        while (trustCache == null) {
                             try {
                                 cacheLock.wait();
                             } catch (InterruptedException iex) {
@@ -576,9 +576,9 @@ public void request() {
             try {
                 boolean interrupted = false;
                 if (File.class == loadType) {
-                    while (sCurrFileLoadCount.get() >= MAX_FILE_LOAD_WORKER
-                            && !HttpTask.this.isCancelled()) {
-                        synchronized (sCurrFileLoadCount) {
+                    synchronized (sCurrFileLoadCount) {
+                        while (sCurrFileLoadCount.get() >= MAX_FILE_LOAD_WORKER
+                                && !HttpTask.this.isCancelled()) {
                             try {
                                 sCurrFileLoadCount.wait(10);
                             } catch (InterruptedException iex) {

diff --git a/xutils/src/main/java/org/xutils/image/ImageDecoder.java b/xutils/src/main/java/org/xutils/image/ImageDecoder.java
@@ -94,9 +94,9 @@ static Drawable decodeFileWithLock(final File file,
             Bitmap bitmap = null;
             { // decode with lock
                 try {
-                    while (bitmapDecodeWorker.get() >= BITMAP_DECODE_MAX_WORKER
-                            && (cancelable == null || !cancelable.isCancelled())) {
-                        synchronized (bitmapDecodeLock) {
+                    synchronized (bitmapDecodeLock) {
+                        while (bitmapDecodeWorker.get() >= BITMAP_DECODE_MAX_WORKER
+                                && (cancelable == null || !cancelable.isCancelled())) {
                             try {
                                 bitmapDecodeLock.wait();
                             } catch (InterruptedException iex) {