github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-22 00:32:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a deadlock in CallbackServer.java.

Browse Source 
-Manifested when running mobile spec. Was caused by CallbackServer
obtaining lock #1 then #2, while other thread obtained #2 then #1.
This commit is contained in:
Andrew Grieve 2012-09-18 13:51:31 -04:00
parent 302d51cdfd
commit 0baf104a75
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
framework/src/org/apache/cordova/CallbackServer.java
View File

@ -211,14 +211,14 @@ public class CallbackServer implements Runnable {
// Wait until there is some data to send, or send empty data every 10 sec // Wait until there is some data to send, or send empty data every 10 sec
// to prevent XHR timeout on the client // to prevent XHR timeout on the client
synchronized (this) { while (this.active) {
while (this.active) { if (jsMessageQueue != null) {
if (jsMessageQueue != null) { payload = jsMessageQueue.popAndEncode();
payload = jsMessageQueue.popAndEncode(); if (payload != null) {
if (payload != null) { break;
break; }
} }
} synchronized (this) {
try { try {
this.wait(10000); // prevent timeout from happening this.wait(10000); // prevent timeout from happening
//Log.d(LOG_TAG, "CallbackServer>>> break <<<"); //Log.d(LOG_TAG, "CallbackServer>>> break <<<");