public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

CB-8031 Fix race condition that shows as ConcurrentModificationException

Browse Source
This commit is contained in:
Andrew Grieve 2014-11-17 22:11:21 -08:00
parent ac284fd39c
commit 1feaa7fed7
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
framework/src/org/apache/cordova/PluginManager.java
View File

@ -110,8 +110,12 @@ public class PluginManager {
@Deprecated // Should not be exposed as public. @Deprecated // Should not be exposed as public.
public void startupPlugins() { public void startupPlugins() {
for (PluginEntry entry : entryMap.values()) { for (PluginEntry entry : entryMap.values()) {
// Add a null entry to for each non-startup plugin to avoid ConcurrentModificationException
// When iterating plugins.
if (entry.onload) { if (entry.onload) {
getPlugin(entry.service); getPlugin(entry.service);
} else {
pluginMap.put(entry.service, null);
} }
} }
} }
@ -232,7 +236,9 @@ public class PluginManager {
*/ */
public void onPause(boolean multitasking) { public void onPause(boolean multitasking) {
for (CordovaPlugin plugin : this.pluginMap.values()) { for (CordovaPlugin plugin : this.pluginMap.values()) {
plugin.onPause(multitasking); if (plugin != null) {
plugin.onPause(multitasking);
}
} }
} }
@ -243,7 +249,9 @@ public class PluginManager {
*/ */
public void onResume(boolean multitasking) { public void onResume(boolean multitasking) {
for (CordovaPlugin plugin : this.pluginMap.values()) { for (CordovaPlugin plugin : this.pluginMap.values()) {
plugin.onResume(multitasking); if (plugin != null) {
plugin.onResume(multitasking);
}
} }
} }
@ -252,7 +260,9 @@ public class PluginManager {
*/ */
public void onDestroy() { public void onDestroy() {
for (CordovaPlugin plugin : this.pluginMap.values()) { for (CordovaPlugin plugin : this.pluginMap.values()) {
plugin.onDestroy(); if (plugin != null) {
plugin.onDestroy();
}
} }
} }
@ -269,9 +279,11 @@ public class PluginManager {
return obj; return obj;
} }
for (CordovaPlugin plugin : this.pluginMap.values()) { for (CordovaPlugin plugin : this.pluginMap.values()) {
obj = plugin.onMessage(id, data); if (plugin != null) {
if (obj != null) { obj = plugin.onMessage(id, data);
return obj; if (obj != null) {
return obj;
}
} }
} }
return null; return null;
@ -282,7 +294,9 @@ public class PluginManager {
*/ */
public void onNewIntent(Intent intent) { public void onNewIntent(Intent intent) {
for (CordovaPlugin plugin : this.pluginMap.values()) { for (CordovaPlugin plugin : this.pluginMap.values()) {
plugin.onNewIntent(intent); if (plugin != null) {
plugin.onNewIntent(intent);
}
} }
} }
@ -320,15 +334,19 @@ public class PluginManager {
*/ */
public void onReset() { public void onReset() {
for (CordovaPlugin plugin : this.pluginMap.values()) { for (CordovaPlugin plugin : this.pluginMap.values()) {
plugin.onReset(); if (plugin != null) {
plugin.onReset();
}
} }
} }
Uri remapUri(Uri uri) { Uri remapUri(Uri uri) {
for (CordovaPlugin plugin : this.pluginMap.values()) { for (CordovaPlugin plugin : this.pluginMap.values()) {
Uri ret = plugin.remapUri(uri); if (plugin != null) {
if (ret != null) { Uri ret = plugin.remapUri(uri);
return ret; if (ret != null) {
return ret;
}
} }
} }
return null; return null;