| commit | f8057d0c2f0e12aeb9a03c49828db5d5211d5bd3 | [log] [tgz] |
|---|---|---|
| author | bahlulh <bahlulhaider@gmail.com> | Fri Jan 17 11:29:51 2020 -0800 |
| committer | Joe Witt <joewitt@apache.org> | Fri Jan 17 15:29:40 2020 -0500 |
| tree | 9a35b42002941dfcaba2f27d04a6ed0b52cdcab0 | |
| parent | 3ef62dd11818d839f766aa2c7773ca948e1e5f0a [diff] |
NIFI-7042: This closes #3996.Azure Reporting Tasking throwing NullReferenceException Signed-off-by: Joe Witt <joewitt@apache.org>
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 @@ 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 @@ @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);