This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.1.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.1.x by this push:
new 9c88f97 [KARAF-4662] Trim bundle and config file locations to avoid
parsing issue
9c88f97 is described below
commit 9c88f97ff1ea423dd4f19c79d3b8d2584d6cf8fb
Author: Jean-Baptiste Onofré <[email protected]>
AuthorDate: Thu Dec 21 15:30:33 2017 +0100
[KARAF-4662] Trim bundle and config file locations to avoid parsing issue
---
.../main/java/org/apache/karaf/kar/internal/KarServiceImpl.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java
b/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java
index 667ac6a..144a99d 100644
--- a/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java
+++ b/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java
@@ -402,22 +402,22 @@ public class KarServiceImpl implements KarService {
throws URISyntaxException {
// add bundles
for (BundleInfo bundleInfo : feature.getBundles()) {
- URI location = new URI(bundleInfo.getLocation());
+ URI location = new URI(bundleInfo.getLocation().trim());
copyResourceToJar(jos, location, locationMap);
}
// add config files
for (ConfigFileInfo configFileInfo : feature.getConfigurationFiles()) {
- URI location = new URI(configFileInfo.getLocation());
+ URI location = new URI(configFileInfo.getLocation().trim());
copyResourceToJar(jos, location, locationMap);
}
// add bundles and config files in conditionals
for (Conditional conditional : feature.getConditional()) {
for (BundleInfo bundleInfo : conditional.getBundles()) {
- URI location = new URI(bundleInfo.getLocation());
+ URI location = new URI(bundleInfo.getLocation().trim());
copyResourceToJar(jos, location, locationMap);
}
for (ConfigFileInfo configFileInfo :
conditional.getConfigurationFiles()) {
- URI location = new URI(configFileInfo.getLocation());
+ URI location = new URI(configFileInfo.getLocation().trim());
copyResourceToJar(jos, location, locationMap);
}
}
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
