You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/10/16 14:32:16 UTC
[karaf] branch karaf-4.2.x updated: A few trivial fixes to wrap
inputstreams in try-with-resources
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new 0decb80 A few trivial fixes to wrap inputstreams in try-with-resources
0decb80 is described below
commit 0decb8097116f4cbdc5da9bc0e1be192afb4978c
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Oct 16 14:30:02 2019 +0100
A few trivial fixes to wrap inputstreams in try-with-resources
(cherry picked from commit 819e72b4848f69fc8778eeba363e46e68b094aa7)
---
.../apache/karaf/features/internal/service/Overrides.java | 4 ++--
.../karaf/instance/core/internal/InstanceServiceImpl.java | 8 ++++----
.../main/java/org/apache/karaf/jpm/impl/ProcessImpl.java | 13 +++++++------
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/Overrides.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/Overrides.java
index 3d2d9b7..d9b5d4a 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/Overrides.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/Overrides.java
@@ -147,9 +147,9 @@ public final class Overrides {
try {
if (overridesUrl != null) {
try (
- InputStream is = new URL(overridesUrl).openStream()
+ InputStream is = new URL(overridesUrl).openStream();
+ BufferedReader reader = new BufferedReader(new InputStreamReader(is))
) {
- BufferedReader reader = new BufferedReader(new InputStreamReader(is));
String line;
while ((line = reader.readLine()) != null) {
line = line.trim();
diff --git a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
index 8a2e178..396721d 100644
--- a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
+++ b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
@@ -845,10 +845,10 @@ public class InstanceServiceImpl implements InstanceService {
String portFile = props.getProperty(KARAF_SHUTDOWN_PORT_FILE);
String shutdown = props.getProperty(KARAF_SHUTDOWN_COMMAND, DEFAULT_SHUTDOWN_COMMAND);
if (port == 0 && portFile != null) {
- BufferedReader r = new BufferedReader(new InputStreamReader(new FileInputStream(portFile)));
- String portStr = r.readLine();
- port = Integer.parseInt(portStr);
- r.close();
+ try (BufferedReader r = new BufferedReader(new InputStreamReader(new FileInputStream(portFile)))) {
+ String portStr = r.readLine();
+ port = Integer.parseInt(portStr);
+ }
}
// We found the port, try to send the command
if (port > 0) {
diff --git a/util/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java b/util/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java
index 5b2af7a..c500cb9 100644
--- a/util/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java
+++ b/util/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java
@@ -61,12 +61,13 @@ public class ProcessImpl implements Process {
} else {
try {
java.lang.Process process = new java.lang.ProcessBuilder("ps", "-p", Integer.toString(pid)).start();
- BufferedReader r = new BufferedReader(new InputStreamReader(process.getInputStream()));
- r.readLine(); // skip headers
- String s = r.readLine();
- boolean running = s != null && s.length() > 0;
- process.waitFor();
- return running;
+ try (BufferedReader r = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+ r.readLine(); // skip headers
+ String s = r.readLine();
+ boolean running = s != null && s.length() > 0;
+ process.waitFor();
+ return running;
+ }
} catch (InterruptedException e) {
throw new InterruptedIOException();
}