This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 81a737d30e2 CAMEL-21673 Fix missing stream closes; fix
getBackOffMaxDelay usage (#1355)
81a737d30e2 is described below
commit 81a737d30e25a9e67aaa99e1959af68825f8f7ba
Author: Tom Cunningham <[email protected]>
AuthorDate: Thu Jan 30 01:12:23 2025 -0500
CAMEL-21673 Fix missing stream closes; fix getBackOffMaxDelay usage (#1355)
* CAMEL-21673 Fix missing stream closes; fix getBackOffMaxDelay usage
* Move stream.close() into finally block
---
.../platform/http/springboot/SpringBootPlatformHttpBinding.java | 1 +
.../SupervisingRouteControllerAutoConfiguration.java | 2 +-
.../camel/springboot/maven/SpringBootAutoConfigurationMojo.java | 1 +
.../org/apache/camel/springboot/maven/SpringBootStarterMojo.java | 9 +++++++--
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git
a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpBinding.java
b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpBinding.java
index d5e493a28b4..657eb8f9089 100644
---
a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpBinding.java
+++
b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpBinding.java
@@ -167,6 +167,7 @@ public class SpringBootPlatformHttpBinding extends
DefaultHttpBinding {
}
} finally {
IOHelper.close(new Closeable[]{is, os});
+ stream.close();
}
} else {
if (LOG.isDebugEnabled()) {
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routecontroller/SupervisingRouteControllerAutoConfiguration.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routecontroller/SupervisingRouteControllerAutoConfiguration.java
index dcdc34f9cf0..3b0428213ae 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routecontroller/SupervisingRouteControllerAutoConfiguration.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routecontroller/SupervisingRouteControllerAutoConfiguration.java
@@ -61,7 +61,7 @@ public class SupervisingRouteControllerAutoConfiguration {
src.setBackOffMaxAttempts(config.getBackOffMaxAttempts());
}
if (config.getBackOffMaxDelay() > 0) {
- src.setBackOffMaxDelay(config.getBackOffDelay());
+ src.setBackOffMaxDelay(config.getBackOffMaxDelay());
}
if (config.getBackOffMaxElapsedTime() > 0) {
src.setBackOffMaxElapsedTime(config.getBackOffMaxElapsedTime());
diff --git
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
index 13d5e91e1c6..da2b5947e3f 100644
---
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
+++
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
@@ -1938,6 +1938,7 @@ public class SpringBootAutoConfigurationMojo extends
AbstractSpringBootGenerator
FileUtils.write(target, code, StandardCharsets.UTF_8);
getLog().info("Created file: " + target);
+ is.close();
} catch (Exception e) {
throw new MojoFailureException("IOError with file " + target,
e);
}
diff --git
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootStarterMojo.java
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootStarterMojo.java
index 7a016385ed9..bfcf25779fd 100644
---
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootStarterMojo.java
+++
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootStarterMojo.java
@@ -117,7 +117,9 @@ public class SpringBootStarterMojo extends
AbstractSpringBootGenerator {
private void fixAdditionalDependencies(Document pom) throws Exception {
Properties properties = new Properties();
-
properties.load(getClass().getResourceAsStream("/spring-boot-fix-dependencies.properties"));
+ InputStream is =
getClass().getResourceAsStream("/spring-boot-fix-dependencies.properties");
+ properties.load(is);
+ is.close();
Set<String> deps = new
TreeSet<>(csvToSet(properties.getProperty(getMainDepArtifactId())));
@@ -233,7 +235,10 @@ public class SpringBootStarterMojo extends
AbstractSpringBootGenerator {
// excluded dependencies
Set<String> configExclusions = new HashSet<>();
Properties properties = new Properties();
-
properties.load(getClass().getResourceAsStream("/spring-boot-fix-dependencies.properties"));
+ InputStream is =
getClass().getResourceAsStream("/spring-boot-fix-dependencies.properties");
+ properties.load(is);
+ is.close();
+
String artExcl = properties.getProperty("exclude_" +
getMainDepArtifactId());
getLog().debug("Configured exclusions: " + artExcl);
if (artExcl != null && !artExcl.trim().isEmpty()) {
