You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by mf...@apache.org on 2014/07/21 20:30:00 UTC

[07/11] git commit: STREAMS-131 | Removed errant change of cleanup call location

STREAMS-131 | Removed errant change of cleanup call location


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

Branch: refs/heads/master
Commit: d7c073c58888a0c61fa7d0e4eed4ab8277ca2a6d
Parents: 32bf3c3
Author: mfranklin <mf...@apache.org>
Authored: Thu Jul 10 14:55:25 2014 -0400
Committer: mfranklin <mf...@apache.org>
Committed: Thu Jul 10 14:55:25 2014 -0400

----------------------------------------------------------------------
 .../org/apache/streams/local/tasks/StreamsPersistWriterTask.java  | 1 -
 .../java/org/apache/streams/local/tasks/StreamsProcessorTask.java | 3 +--
 .../java/org/apache/streams/local/tasks/StreamsProviderTask.java  | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7c073c5/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsPersistWriterTask.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsPersistWriterTask.java b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsPersistWriterTask.java
index bdda66a..4ec5fe9 100644
--- a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsPersistWriterTask.java
+++ b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsPersistWriterTask.java
@@ -123,7 +123,6 @@ public class StreamsPersistWriterTask extends BaseStreamsTask implements DatumSt
     @Override
     public void stopTask() {
         this.keepRunning.set(false);
-        this.writer.cleanUp();
     }
 
 

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7c073c5/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProcessorTask.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProcessorTask.java b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProcessorTask.java
index 7fbad16..f3004b4 100644
--- a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProcessorTask.java
+++ b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProcessorTask.java
@@ -63,7 +63,6 @@ public class StreamsProcessorTask extends BaseStreamsTask {
     @Override
     public void stopTask() {
         this.keepRunning.set(false);
-        this.processor.cleanUp();
     }
 
     @Override
@@ -106,8 +105,8 @@ public class StreamsProcessorTask extends BaseStreamsTask {
             }
 
         } finally {
-            this.processor.cleanUp();
             this.isRunning.set(false);
+            this.processor.cleanUp();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7c073c5/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProviderTask.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProviderTask.java b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProviderTask.java
index 9eba6cd..88f6f48 100644
--- a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProviderTask.java
+++ b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProviderTask.java
@@ -110,7 +110,6 @@ public class StreamsProviderTask extends BaseStreamsTask implements DatumStatusC
     public void stopTask() {
         LOGGER.debug("Stopping Provider Task for {}", this.provider.getClass().getSimpleName());
         this.keepRunning.set(false);
-        this.provider.cleanUp();
     }
 
     @Override