You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by va...@apache.org on 2021/11/30 21:53:42 UTC
[camel] branch main updated (651645b -> c5b9a74)
This is an automated email from the ASF dual-hosted git repository.
valdar pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 651645b rewrite improving-the-documentation.adoc
new e9a36d0 [CAMEL-17252] fix Error in KameletYamlRoutes while loading routes based on kemelets without dependencies.
new c5b9a74 chore(checkstyle): fixed missing file header
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:
.../org/apache/camel/health/HealthCheckResolver.java | 16 ++++++++++++++++
.../java/org/apache/camel/main/KameletYamlRoutes.java | 2 +-
2 files changed, 17 insertions(+), 1 deletion(-)
[camel] 01/02: [CAMEL-17252] fix Error in KameletYamlRoutes while loading routes based on kemelets without dependencies.
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
valdar pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e9a36d01823b995313a018f35c10cb535d79090d
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Tue Nov 30 21:53:03 2021 +0100
[CAMEL-17252] fix Error in KameletYamlRoutes while loading routes based on kemelets without dependencies.
---
.../src/main/java/org/apache/camel/main/KameletYamlRoutes.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletYamlRoutes.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletYamlRoutes.java
index 93f6c71..81ab568 100644
--- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletYamlRoutes.java
+++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletYamlRoutes.java
@@ -63,7 +63,7 @@ class KameletYamlRoutes extends YamlRoutesBuilderLoaderSupport implements CamelC
final List<String> dependencies = new ArrayList<>();
Node deps = nodeAt(node, "/spec/dependencies");
- if (deps.getNodeType() == NodeType.SEQUENCE) {
+ if (deps != null && deps.getNodeType() == NodeType.SEQUENCE) {
SequenceNode sn = (SequenceNode) deps;
for (Node child : sn.getValue()) {
if (child.getNodeType() == NodeType.SCALAR) {
[camel] 02/02: chore(checkstyle): fixed missing file header
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
valdar pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c5b9a74eb9072ebaf22b98617cb99b88524816fb
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Tue Nov 30 22:06:39 2021 +0100
chore(checkstyle): fixed missing file header
---
.../org/apache/camel/health/HealthCheckResolver.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckResolver.java b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckResolver.java
index 35f71af..342102a 100644
--- a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckResolver.java
+++ b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckResolver.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.camel.health;
import org.apache.camel.CamelContextAware;