You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/10/05 07:36:26 UTC
[camel] branch main updated (cb47a476d6d -> 9a00f167557)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from cb47a476d6d Align versions to spring boot 2.7.4 (#8442)
new 6759031bad2 (chores) camel-aws-xray: prevent a NPE
new 9a00f167557 (chores) camel-azure-key-value: prevent a NPE retrieving event data
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:
.../xray/decorators/http/RestSegmentDecorator.java | 7 ++++++-
.../azure/key/vault/EventhubsReloadTriggerTask.java | 20 +++++++++++---------
2 files changed, 17 insertions(+), 10 deletions(-)
[camel] 01/02: (chores) camel-aws-xray: prevent a NPE
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6759031bad231ea067e12f75d17510501ab4db8b
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Oct 4 16:42:48 2022 +0200
(chores) camel-aws-xray: prevent a NPE
Although unlikely, it's possible for an NPE to be thrown if the URI is malformed
---
.../component/aws/xray/decorators/http/RestSegmentDecorator.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/decorators/http/RestSegmentDecorator.java b/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/decorators/http/RestSegmentDecorator.java
index fb1ca618b8c..e32c642c37f 100644
--- a/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/decorators/http/RestSegmentDecorator.java
+++ b/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/decorators/http/RestSegmentDecorator.java
@@ -71,7 +71,7 @@ public class RestSegmentDecorator extends AbstractHttpSegmentDecorator {
try {
path = URLDecoder.decode(path, "UTF-8");
} catch (UnsupportedEncodingException e) {
- LOG.debug("Failed to decode URL path '" + path + "', ignoring exception", e);
+ LOG.warn("Failed to decode URL path '{}', ignoring exception", path, e);
}
}
}
@@ -79,6 +79,11 @@ public class RestSegmentDecorator extends AbstractHttpSegmentDecorator {
}
protected static List<String> getParameters(String path) {
+ if (path == null) {
+ LOG.warn("The provided path is null and has no parameters to be evaluated");
+ return Collections.emptyList();
+ }
+
List<String> parameters = null;
int startIndex = path.indexOf('{');
[camel] 02/02: (chores) camel-azure-key-value: prevent a NPE retrieving event data
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9a00f167557c0b3126c422dc73bb1092671f6737
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Oct 4 16:51:26 2022 +0200
(chores) camel-azure-key-value: prevent a NPE retrieving event data
---
.../azure/key/vault/EventhubsReloadTriggerTask.java | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/EventhubsReloadTriggerTask.java b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/EventhubsReloadTriggerTask.java
index 5c821111105..173e8b8b9a4 100644
--- a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/EventhubsReloadTriggerTask.java
+++ b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/EventhubsReloadTriggerTask.java
@@ -34,7 +34,6 @@ import com.azure.storage.blob.BlobContainerAsyncClient;
import com.azure.storage.blob.BlobContainerClientBuilder;
import com.azure.storage.common.StorageSharedKeyCredential;
import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.camel.CamelContext;
@@ -214,14 +213,8 @@ public class EventhubsReloadTriggerTask extends ServiceSupport implements CamelC
boolean triggerReloading = false;
ObjectMapper mapper = new ObjectMapper();
- JsonNode actualObj = null;
- try {
- actualObj = mapper.readTree(eventContext.getEventData().getBodyAsString());
- } catch (JsonMappingException e) {
- e.printStackTrace();
- } catch (JsonProcessingException e) {
- e.printStackTrace();
- }
+ final JsonNode actualObj = retrieveEventData(eventContext, mapper);
+
for (int i = 0; i < actualObj.size(); i++) {
String secret = actualObj.get(i).get("subject").textValue();
String eventType = actualObj.get(i).get("eventType").textValue();
@@ -249,6 +242,15 @@ public class EventhubsReloadTriggerTask extends ServiceSupport implements CamelC
}
}
+ private static JsonNode retrieveEventData(EventContext eventContext, ObjectMapper mapper) {
+ try {
+ return mapper.readTree(eventContext.getEventData().getBodyAsString());
+ } catch (JsonProcessingException e) {
+ LOG.warn("Unable to process event data body: {}", e.getMessage(), e);
+ throw new RuntimeCamelException(e);
+ }
+ }
+
public void onErrorListener(final ErrorContext errorContext) {
// NOOP
}