This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.7.x by this push:
new c688478 CAMEL-16622: FileUtil should not compact https urls
c688478 is described below
commit c688478c939d571b9c455c322b6243cd86bcd0c9
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon May 17 11:01:09 2021 +0200
CAMEL-16622: FileUtil should not compact https urls
---
.../src/test/java/org/apache/camel/util/FileUtilTest.java | 8 ++++++++
core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java
b/core/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java
index 1fea8e0..71b0ac8 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java
@@ -271,4 +271,12 @@ public class FileUtilTest {
String out = FileUtil.compactPath(in, "/");
assertEquals(in, out);
}
+
+ @Test
+ public void testCompactHttpsPath() {
+ String in =
"https://foo.com/apps/func/schemas/part/myap/dummy-schema.xsd";
+ String out = FileUtil.compactPath(in, "/");
+ assertEquals(in, out);
+ }
+
}
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java
b/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java
index 1cf328b..5ef0828 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java
@@ -278,7 +278,7 @@ public final class FileUtil {
return null;
}
- if (path.startsWith("http:")) {
+ if (path.startsWith("http:") || path.startsWith("https:")) {
return path;
}