incubator-s4-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dfe...@apache.org
Subject [2/2] git commit: Merge branch 'S4-103' into dev
Date Thu, 07 Mar 2013 10:14:21 GMT
Updated Branches:
  refs/heads/dev bac9cb201 -> c8f070a1c


Merge branch 'S4-103' into dev


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

Branch: refs/heads/dev
Commit: c8f070a1c800f0117e995821d9841d6a7f4c0bef
Parents: bac9cb2 cd8f28a
Author: Daniel Gómez Ferro <dferro@apache.org>
Authored: Thu Mar 7 10:57:45 2013 +0100
Committer: Daniel Gómez Ferro <dferro@apache.org>
Committed: Thu Mar 7 10:57:45 2013 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/s4/base/Event.java    |   33 ++-------------
 .../org/apache/s4/comm/topology/RemoteStreams.java |   18 ++++++--
 .../apache/s4/comm/topology/StreamConsumer.java    |   11 +----
 .../apache/s4/comm/topology/ZkRemoteStreams.java   |   23 ++++------
 .../src/main/java/org/apache/s4/core/App.java      |   18 +--------
 .../org/apache/s4/core/DefaultRemoteSenders.java   |    3 +-
 .../main/java/org/apache/s4/core/ReceiverImpl.java |   27 +++---------
 .../main/java/org/apache/s4/core/RemoteStream.java |    3 +-
 .../src/main/java/org/apache/s4/core/Stream.java   |    1 -
 9 files changed, 38 insertions(+), 99 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/c8f070a1/subprojects/s4-core/src/main/java/org/apache/s4/core/App.java
----------------------------------------------------------------------
diff --cc subprojects/s4-core/src/main/java/org/apache/s4/core/App.java
index b3c0586,8a5a276..bd3848e
--- a/subprojects/s4-core/src/main/java/org/apache/s4/core/App.java
+++ b/subprojects/s4-core/src/main/java/org/apache/s4/core/App.java
@@@ -61,10 -60,9 +61,9 @@@ public abstract class App 
      final private List<Streamable<Event>> streams = new ArrayList<Streamable<Event>>();
  
      /* Pes indexed by name. */
 -    Map<String, ProcessingElement> peByName = Maps.newHashMap();
 +    final Map<String, ProcessingElement> peByName = Maps.newHashMap();
  
      private ClockType clockType = ClockType.WALL_CLOCK;
-     private int id = -1;
  
      @Inject
      private Sender sender;


Mime
View raw message