[nifi] branch master updated: NIFI-7042: This closes #3996.Azure Reporting Tasking throwing NullReferenceException

[joewitt]

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

joewitt 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 f8057d0  NIFI-7042: This closes #3996.Azure Reporting Tasking throwing 
NullReferenceException
f8057d0 is described below

commit f8057d0c2f0e12aeb9a03c49828db5d5211d5bd3
Author: bahlulh <bahlulhai...@gmail.com>
AuthorDate: Fri Jan 17 11:29:51 2020 -0800

    NIFI-7042: This closes #3996.Azure Reporting Tasking throwing 
NullReferenceException
    
    Signed-off-by: Joe Witt <joew...@apache.org>
---
 .../azure/loganalytics/AbstractAzureLogAnalyticsReportingTask.java       | 1 -
 .../reporting/azure/loganalytics/AzureLogAnalyticsReportingTask.java     | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AbstractAzureLogAnalyticsReportingTask.java
 
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AbstractAzureLogAnalyticsReportingTask.java
index d48c765..245e6bb 100644
--- 
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AbstractAzureLogAnalyticsReportingTask.java
+++ 
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AbstractAzureLogAnalyticsReportingTask.java
@@ -139,7 +139,6 @@ public abstract class 
AbstractAzureLogAnalyticsReportingTask extends AbstractRep
         request.addHeader("Authorization", createAuthorization);
         request.addHeader("x-ms-date", nowRfc1123);
         request.setEntity(new StringEntity(rawJson));
-        request.setEntity(new StringEntity(rawJson));
         try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
             postRequest(httpClient, request);
         }
diff --git 
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AzureLogAnalyticsReportingTask.java
 
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AzureLogAnalyticsReportingTask.java
index f9d9a82..8b8e85d 100644
--- 
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AzureLogAnalyticsReportingTask.java
+++ 
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AzureLogAnalyticsReportingTask.java
@@ -62,6 +62,7 @@ public class AzureLogAnalyticsReportingTask extends 
AbstractAzureLogAnalyticsRep
     @Override
     protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
         final List<PropertyDescriptor> properties = new ArrayList<>();
+        properties.add(SEND_JVM_METRICS);
         properties.add(LOG_ANALYTICS_WORKSPACE_ID);
         properties.add(LOG_ANALYTICS_CUSTOM_LOG_NAME);
         properties.add(LOG_ANALYTICS_WORKSPACE_KEY);