You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by tu...@apache.org on 2022/10/10 21:44:54 UTC

[nifi] branch main updated: NIFI-10602: Fix GetHubSpot and GetShopify state handling on NiFi restart

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

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


The following commit(s) were added to refs/heads/main by this push:
     new ad08e8befc NIFI-10602: Fix GetHubSpot and GetShopify state handling on NiFi restart
ad08e8befc is described below

commit ad08e8befcfc9bd4d62aee7807aec0ef279f762a
Author: Lehel Boér <Le...@hotmail.com>
AuthorDate: Fri Oct 7 19:26:43 2022 +0200

    NIFI-10602: Fix GetHubSpot and GetShopify state handling on NiFi restart
    
    This closes #6495.
    
    Signed-off-by: Peter Turcsanyi <tu...@apache.org>
---
 .../src/main/java/org/apache/nifi/processors/hubspot/GetHubSpot.java    | 2 +-
 .../src/main/java/org/apache/nifi/processors/shopify/GetShopify.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nifi-nar-bundles/nifi-hubspot-bundle/nifi-hubspot-processors/src/main/java/org/apache/nifi/processors/hubspot/GetHubSpot.java b/nifi-nar-bundles/nifi-hubspot-bundle/nifi-hubspot-processors/src/main/java/org/apache/nifi/processors/hubspot/GetHubSpot.java
index ccac612157..be6e656211 100644
--- a/nifi-nar-bundles/nifi-hubspot-bundle/nifi-hubspot-processors/src/main/java/org/apache/nifi/processors/hubspot/GetHubSpot.java
+++ b/nifi-nar-bundles/nifi-hubspot-bundle/nifi-hubspot-processors/src/main/java/org/apache/nifi/processors/hubspot/GetHubSpot.java
@@ -201,7 +201,7 @@ public class GetHubSpot extends AbstractProcessor {
 
     @Override
     public void onPropertyModified(final PropertyDescriptor descriptor, final String oldValue, final String newValue) {
-        if (OBJECT_TYPE.equals(descriptor) || IS_INCREMENTAL.equals(descriptor)) {
+        if (isConfigurationRestored() && (OBJECT_TYPE.equals(descriptor) || IS_INCREMENTAL.equals(descriptor))) {
             isObjectTypeModified = true;
         }
     }
diff --git a/nifi-nar-bundles/nifi-shopify-bundle/nifi-shopify-processors/src/main/java/org/apache/nifi/processors/shopify/GetShopify.java b/nifi-nar-bundles/nifi-shopify-bundle/nifi-shopify-processors/src/main/java/org/apache/nifi/processors/shopify/GetShopify.java
index 1cb04c5d7b..6667aed248 100644
--- a/nifi-nar-bundles/nifi-shopify-bundle/nifi-shopify-processors/src/main/java/org/apache/nifi/processors/shopify/GetShopify.java
+++ b/nifi-nar-bundles/nifi-shopify-bundle/nifi-shopify-processors/src/main/java/org/apache/nifi/processors/shopify/GetShopify.java
@@ -231,7 +231,7 @@ public class GetShopify extends AbstractProcessor {
     private volatile boolean isResetState;
 
     public void onPropertyModified(final PropertyDescriptor descriptor, final String oldValue, final String newValue) {
-        if (RESET_STATE_PROPERTY_NAMES.contains(descriptor.getName())) {
+        if (isConfigurationRestored() && RESET_STATE_PROPERTY_NAMES.contains(descriptor.getName())) {
             isResetState = true;
         }
     }