[nifi] branch master updated: NIFI-6989: Removed call to cancel() in SiteToSiteReportingSink

[pvillard]

This is an automated email from the ASF dual-hosted git repository.

pvillard pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new 28aa155  NIFI-6989: Removed call to cancel() in SiteToSiteReportingSink
28aa155 is described below

commit 28aa155fd43af1eef8ece38cf1ca2581be6c21cf
Author: Matthew Burgess <mattyb...@apache.org>
AuthorDate: Wed Jan 8 22:42:23 2020 -0500

    NIFI-6989: Removed call to cancel() in SiteToSiteReportingSink
    
    Signed-off-by: Pierre Villard <pierre.villard...@gmail.com>
    
    This closes #3969.
---
 .../org/apache/nifi/reporting/sink/SiteToSiteReportingRecordSink.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/sink/SiteToSiteReportingRecordSink.java
 
b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/sink/SiteToSiteReportingRecordSink.java
index 574ebd4..20c501e 100644
--- 
a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/sink/SiteToSiteReportingRecordSink.java
+++ 
b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/sink/SiteToSiteReportingRecordSink.java
@@ -163,8 +163,6 @@ public class SiteToSiteReportingRecordSink extends 
AbstractControllerService imp
                     transaction.send(out.toByteArray(), attributes);
                     transaction.confirm();
                     transaction.complete();
-                } else {
-                    transaction.cancel("No data to send");
                 }
             }
             return writeResult;