commit 3d7b7717ac509486663f7a59a27ddca1ef780816
author Arpad Boda <aboda@hortonworks.com> Thu Jun 13 14:53:02 2019 +0200
committer Marc Parisi <phrocker@apache.org> Sun Jun 16 07:03:24 2019 -0400
tree 71aa8d68e7133f96bb77525756f2f3d43e7bb5d4
parent 23b30f7e5521efe0ec488057036a1b52f19132fe

MINIFICPP-919 - Site2Site transaction CRC checksum randomly fails to match on Windows

This closes #593.

Signed-off-by: Marc Parisi <phrocker@apache.org>

libminifi/include/sitetosite/SiteToSite.h

diff --git a/libminifi/include/sitetosite/SiteToSite.h b/libminifi/include/sitetosite/SiteToSite.h
index 2cc0823..6ba2dbb 100644
--- a/libminifi/include/sitetosite/SiteToSite.h
+++ b/libminifi/include/sitetosite/SiteToSite.h
@@ -281,7 +281,7 @@
     return _direction;
   }
   // getCRC
-  long getCRC() {
+  uint64_t getCRC() {
     return crcStream.getCRC();
   }
   // updateCRC

libminifi/src/sitetosite/SiteToSiteClient.cpp

diff --git a/libminifi/src/sitetosite/SiteToSiteClient.cpp b/libminifi/src/sitetosite/SiteToSiteClient.cpp
index 3bc91fe..db145d7 100644
--- a/libminifi/src/sitetosite/SiteToSiteClient.cpp
+++ b/libminifi/src/sitetosite/SiteToSiteClient.cpp
@@ -273,7 +273,7 @@
     if (code == CONFIRM_TRANSACTION) {
       logger_->log_debug("Site2Site transaction %s peer confirm transaction with CRC %s", transactionID, message);
       if (this->_currentVersion > 3) {
-        int64_t crcValue = transaction->getCRC();
+        uint64_t crcValue = transaction->getCRC();
         std::string crc = std::to_string(crcValue);
         if (message == crc) {
           logger_->log_debug("Site2Site transaction %s CRC matched", transactionID);