You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by da...@apache.org on 2015/11/02 20:15:25 UTC

[1/2] incubator-apex-malhar git commit: - MLHR-1887 #resolve made shutdown field volatile since it is written and read by separate threads.

Repository: incubator-apex-malhar
Updated Branches:
  refs/heads/devel-3 83f297ee8 -> 6bbe17f34


- MLHR-1887 #resolve made shutdown field volatile since it is written and read by separate threads.


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/a113bc9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/a113bc9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/a113bc9e

Branch: refs/heads/devel-3
Commit: a113bc9e2d1af1d0e9874b81204bd9511fe6b75f
Parents: 2805d61
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Fri Oct 30 16:55:53 2015 -0700
Committer: Timothy Farkas <ti...@datatorrent.com>
Committed: Fri Oct 30 16:55:53 2015 -0700

----------------------------------------------------------------------
 .../main/java/com/datatorrent/lib/io/WebSocketInputOperator.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a113bc9e/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java b/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
index 3d7bc7a..fcd0398 100644
--- a/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
@@ -62,7 +62,7 @@ public class WebSocketInputOperator<T> extends SimpleSinglePortInputOperator<T>
   protected transient final ObjectMapper mapper = new ObjectMapper(jsonFactory);
   protected transient WebSocket connection;
   private transient boolean connectionClosed = false;
-  private transient boolean shutdown = false;
+  private transient volatile boolean shutdown = false;
   private int ioThreadMultiplier = 1;
   protected boolean skipNull = false;
 


[2/2] incubator-apex-malhar git commit: Merge branch 'MLHR-1887' of github.com:ilooner/incubator-apex-malhar into devel-3

Posted by da...@apache.org.
Merge branch 'MLHR-1887' of github.com:ilooner/incubator-apex-malhar into devel-3


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/6bbe17f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/6bbe17f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/6bbe17f3

Branch: refs/heads/devel-3
Commit: 6bbe17f34eacb7ddcca0a29a5d178ae32c70c948
Parents: 83f297e a113bc9
Author: David Yan <da...@datatorrent.com>
Authored: Mon Nov 2 11:15:05 2015 -0800
Committer: David Yan <da...@datatorrent.com>
Committed: Mon Nov 2 11:15:05 2015 -0800

----------------------------------------------------------------------
 .../main/java/com/datatorrent/lib/io/WebSocketInputOperator.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------