You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2018/06/14 13:19:09 UTC
[1/2] incubator-weex git commit: [WEEX-342][android]
ava.util.ConcurrentModificationException at
java.util.ArrayList$ArrayListIterator.next(ArrayList.java:573)at
com.taobao.weex.ui.component.WXComponent.applyEvents(WXComponent.java:290)
Repository: incubator-weex
Updated Branches:
refs/heads/master 97967ae61 -> 8d1fc2f3f
[WEEX-342][android] ava.util.ConcurrentModificationException at java.util.ArrayList$ArrayListIterator.next(ArrayList.java:573)at com.taobao.weex.ui.component.WXComponent.applyEvents(WXComponent.java:290)
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c8d4d62f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c8d4d62f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c8d4d62f
Branch: refs/heads/master
Commit: c8d4d62f34f70f825301eb47fbac2b73b07bcd5e
Parents: c60016f
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Thu Jun 14 20:41:35 2018 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Thu Jun 14 20:41:35 2018 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/component/WXComponent.java | 12 ++++++++++--
.../java/com/taobao/weex/ui/view/gesture/WXGesture.java | 6 +++++-
2 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c8d4d62f/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index 9572986..072d8f4 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -290,7 +290,11 @@ public abstract class WXComponent<T extends View> extends WXBasicComponent imple
if (getEvents() == null || getEvents().isEmpty())
return;
WXEvent event = getEvents();
- for(int i=0; i<event.size(); i++){
+ int size = event.size();
+ for (int i=0; i<size; i++) {
+ if(i >= event.size()){
+ break;
+ }
String type = event.get(i);
addEvent(type);
}
@@ -1447,7 +1451,11 @@ public abstract class WXComponent<T extends View> extends WXBasicComponent imple
return;
}
WXEvent events = getEvents();
- for (int i=0; i<events.size(); i++) {
+ int size = events.size();
+ for (int i=0; i<size; i++) {
+ if(i >= events.size()){
+ break;
+ }
String event = events.get(i);
if (event == null) {
continue;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c8d4d62f/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java
index be114a9..ee48c6a 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java
@@ -140,7 +140,11 @@ public class WXGesture extends GestureDetector.SimpleOnGestureListener implement
if(event == null){
return false;
}
- for(int i=0; i<event.size(); i++){
+ int size = event.size();
+ for (int i=0; i<size; i++) {
+ if(i >= event.size()){
+ break;
+ }
String type = event.get(i);
if(isStopPropagation(type)){
return true;
[2/2] incubator-weex git commit: Merge branch 'release0.19-bugfix' of
https://github.com/gubaojian/incubator-weex
Posted by ky...@apache.org.
Merge branch 'release0.19-bugfix' of https://github.com/gubaojian/incubator-weex
This closes #1273
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8d1fc2f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8d1fc2f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8d1fc2f3
Branch: refs/heads/master
Commit: 8d1fc2f3f424462726f85aa6232f6635cc5cf940
Parents: 97967ae c8d4d62
Author: YorkShen <sh...@gmail.com>
Authored: Thu Jun 14 21:18:48 2018 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Thu Jun 14 21:18:48 2018 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/component/WXComponent.java | 12 ++++++++++--
.../java/com/taobao/weex/ui/view/gesture/WXGesture.java | 6 +++++-
2 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------