Merge branch 'master' of github.com:project-hop/hop
diff --git a/engine/src/main/java/org/apache/hop/pipeline/debug/PipelineDebugMeta.java b/engine/src/main/java/org/apache/hop/pipeline/debug/PipelineDebugMeta.java
index 93bd976..e129698 100644
--- a/engine/src/main/java/org/apache/hop/pipeline/debug/PipelineDebugMeta.java
+++ b/engine/src/main/java/org/apache/hop/pipeline/debug/PipelineDebugMeta.java
@@ -52,6 +52,7 @@
private PipelineMeta pipelineMeta;
private Map<TransformMeta, TransformDebugMeta> transformDebugMetaMap;
+ private boolean dataShown = false;
public PipelineDebugMeta( PipelineMeta pipelineMeta ) {
this.pipelineMeta = pipelineMeta;
@@ -90,6 +91,7 @@
// for every transform in the map, add a row listener...
//
+ dataShown=false;
for ( final TransformMeta transformMeta : transformDebugMetaMap.keySet() ) {
final TransformDebugMeta transformDebugMeta = transformDebugMetaMap.get( transformMeta );
@@ -126,6 +128,7 @@
// Also call the pause / break-point listeners on the transform debugger...
//
+ dataShown = true;
transformDebugMeta.fireBreakPointListeners( PipelineDebugMeta.this );
}
} else if ( transformDebugMeta.isPausingOnBreakPoint() && transformDebugMeta.getCondition() != null ) {
@@ -186,6 +189,9 @@
//
try {
pipeline.addExecutionFinishedListener( p -> {
+ if (dataShown) {
+ return;
+ }
for (TransformMeta transformMeta : transformDebugMetaMap.keySet()) {
TransformDebugMeta transformDebugMeta = transformDebugMetaMap.get( transformMeta );
if (transformDebugMeta!=null) {
diff --git a/engine/src/main/java/org/apache/hop/pipeline/transform/BaseTransform.java b/engine/src/main/java/org/apache/hop/pipeline/transform/BaseTransform.java
index 32428a7..ca9ca78 100644
--- a/engine/src/main/java/org/apache/hop/pipeline/transform/BaseTransform.java
+++ b/engine/src/main/java/org/apache/hop/pipeline/transform/BaseTransform.java
@@ -2755,8 +2755,6 @@
if (!markStopped.get()) {
markStopped.set( true );
- System.out.println( "####> markStop() on Transform : " + getTransformName() + " copy " + getCopy() );
-
Calendar cal = Calendar.getInstance();
stopTime = cal.getTime();
@@ -2765,19 +2763,13 @@
//
synchronized ( transformListeners ) {
for ( ITransformListener transformListener : transformListeners ) {
- if ("/tmp/all.txt".equals(getTransformName())) {
- System.out.println( "------------> MARKING STOP on Transform : " + getTransformName() + " copy " + getCopy() + ". Listener = " + transformListener.toString() );
- }
transformListener.transformFinished( pipeline, transformMeta, this );
- // System.out.println( "<------------ MARKED STOP on Transform : " + getTransformName() + " copy " + getCopy() + ". Listener = " + transformListener.toString() );
}
}
// We're finally completely done with this transform.
//
setRunning( false );
-
- System.out.println( "<#### markStop() on Transform : " + getTransformName() + " copy " + getCopy() );
}
}
