Merge branch 'master' into 4.0.x (gradle java 6 & PluginManager race fix)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/e597f98c Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/e597f98c Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/e597f98c Branch: refs/heads/4.0.x Commit: e597f98c628c3f11fbe1c699f73f4d392448a29d Parents: 9d3c130 7fbb2b1 Author: Andrew Grieve <[email protected]> Authored: Wed Nov 26 11:47:24 2014 -0500 Committer: Andrew Grieve <[email protected]> Committed: Wed Nov 26 11:48:08 2014 -0500 ---------------------------------------------------------------------- bin/templates/cordova/lib/plugin-build.gradle | 4 +- bin/templates/project/build.gradle | 4 +- framework/build.gradle | 4 +- .../src/org/apache/cordova/PluginManager.java | 40 ++++++++++++++------ 4 files changed, 35 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e597f98c/bin/templates/project/build.gradle ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e597f98c/framework/src/org/apache/cordova/PluginManager.java ---------------------------------------------------------------------- diff --cc framework/src/org/apache/cordova/PluginManager.java index bf69314,7ddf300..0c0b9c6 --- a/framework/src/org/apache/cordova/PluginManager.java +++ b/framework/src/org/apache/cordova/PluginManager.java @@@ -85,10 -95,27 +85,14 @@@ public class PluginManager /** * Create plugins objects that have onload set. */ - @Deprecated // Should not be exposed as public. - public void startupPlugins() { + private void startupPlugins() { for (PluginEntry entry : entryMap.values()) { + // Add a null entry to for each non-startup plugin to avoid ConcurrentModificationException + // When iterating plugins. if (entry.onload) { getPlugin(entry.service); + } else { + pluginMap.put(entry.service, null); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
