You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/11/10 09:06:35 UTC
[camel-kafka-connector] branch master updated: Avoid NPE on Windows
for Catalog initialization #697
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
The following commit(s) were added to refs/heads/master by this push:
new 6c97e2c Avoid NPE on Windows for Catalog initialization #697
6c97e2c is described below
commit 6c97e2ca3d51a6078218a403fb6f7e078bc76320
Author: Aurélien Pupier <ap...@redhat.com>
AuthorDate: Tue Nov 10 09:15:30 2020 +0100
Avoid NPE on Windows for Catalog initialization #697
path inside bundles are always using "/", it is a resource path, not a
file path. i tis then not using a file separator.
Signed-off-by: Aurélien Pupier <ap...@redhat.com>
---
.../camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/camel-kafka-connector-catalog/src/main/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java b/camel-kafka-connector-catalog/src/main/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java
index 891d7fe..0c39027 100644
--- a/camel-kafka-connector-catalog/src/main/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java
+++ b/camel-kafka-connector-catalog/src/main/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java
@@ -17,7 +17,6 @@
package org.apache.camel.kafkaconnector.catalog;
import java.io.BufferedReader;
-import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@@ -62,8 +61,7 @@ public class CamelKafkaConnectorCatalog {
}
private void initCatalog() {
- try (InputStream input = CamelKafkaConnectorCatalog.class.getResourceAsStream(File.separator + DESCRIPTORS_DIR + File.separator + CONNECTORS_PROPERTIES)) {
-
+ try (InputStream input = CamelKafkaConnectorCatalog.class.getResourceAsStream("/" + DESCRIPTORS_DIR + "/" + CONNECTORS_PROPERTIES)) {
BufferedReader reader = new BufferedReader(new InputStreamReader(input));
while (reader.ready()) {
@@ -89,7 +87,7 @@ public class CamelKafkaConnectorCatalog {
private String loadConnectorAsJsonFromEmbeddedCatalog(String connectorName) {
String result = null;
- try (InputStream connectorModelInputSream = CamelKafkaConnectorCatalog.class.getResourceAsStream(File.separator + CONNECTORS_DIR + File.separator + connectorName + ".json")) {
+ try (InputStream connectorModelInputSream = CamelKafkaConnectorCatalog.class.getResourceAsStream("/" + CONNECTORS_DIR + "/" + connectorName + ".json")) {
result = new BufferedReader(new InputStreamReader(connectorModelInputSream, StandardCharsets.UTF_8))
.lines()
.map(String::trim) // to change line