You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2020/03/18 14:47:48 UTC
[nifi] branch support/nifi-1.11.x updated (4e4fa38 -> e9cb6c1)
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a change to branch support/nifi-1.11.x
in repository https://gitbox.apache.org/repos/asf/nifi.git.
from 4e4fa38 NIFI-7223 Resolved merge conflicts from additional test case for null key password.
new 53ca44d NIFI-7258 - fix overflow in PutAzureEventHub when not configured correctly
new e9cb6c1 NIFI-7267 - Upgrade spring-data-redis in Redis bundle (#4150)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/nifi/processors/azure/eventhub/PutAzureEventHub.java | 9 +++++++--
nifi-nar-bundles/nifi-redis-bundle/pom.xml | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
[nifi] 01/02: NIFI-7258 - fix overflow in PutAzureEventHub when not
configured correctly
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.11.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 53ca44d9625dc7681d717d332c893bb50517224a
Author: Pierre Villard <pi...@gmail.com>
AuthorDate: Mon Mar 16 18:58:55 2020 +0100
NIFI-7258 - fix overflow in PutAzureEventHub when not configured correctly
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #4146.
---
.../apache/nifi/processors/azure/eventhub/PutAzureEventHub.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/PutAzureEventHub.java b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/PutAzureEventHub.java
index 2c9a8ae..ec47384 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/PutAzureEventHub.java
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/PutAzureEventHub.java
@@ -179,7 +179,12 @@ public class PutAzureEventHub extends AbstractProcessor {
@Override
public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
- populateSenderQueue(context);
+ try {
+ populateSenderQueue(context);
+ } catch (ProcessException e) {
+ context.yield();
+ throw e;
+ }
final StopWatch stopWatch = new StopWatch(true);
@@ -343,7 +348,7 @@ public class PutAzureEventHub extends AbstractProcessor {
EventHubClientImpl.USER_AGENT = "ApacheNiFi-azureeventhub/2.3.2";
return EventHubClient.createSync(getConnectionString(namespace, eventHubName, policyName, policyKey), executor);
} catch (IOException | EventHubException | IllegalConnectionStringFormatException e) {
- getLogger().error("Failed to create EventHubClient due to {}", e);
+ getLogger().error("Failed to create EventHubClient due to {}", new Object[]{e.getMessage()}, e);
throw new ProcessException(e);
}
}
[nifi] 02/02: NIFI-7267 - Upgrade spring-data-redis in Redis bundle
(#4150)
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.11.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit e9cb6c1e3609bb928df0eab452d4ba14d4720d65
Author: Pierre Villard <pi...@gmail.com>
AuthorDate: Tue Mar 17 23:51:28 2020 +0100
NIFI-7267 - Upgrade spring-data-redis in Redis bundle (#4150)
Signed-off-by: Andy LoPresto <al...@apache.org>
---
nifi-nar-bundles/nifi-redis-bundle/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nifi-nar-bundles/nifi-redis-bundle/pom.xml b/nifi-nar-bundles/nifi-redis-bundle/pom.xml
index 7344b6b..9fc76e0 100644
--- a/nifi-nar-bundles/nifi-redis-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-redis-bundle/pom.xml
@@ -27,7 +27,7 @@
<packaging>pom</packaging>
<properties>
- <spring.data.redis.version>2.1.0.RELEASE</spring.data.redis.version>
+ <spring.data.redis.version>2.1.16.RELEASE</spring.data.redis.version>
</properties>
<modules>