Repository: karaf Updated Branches: refs/heads/karaf-4.0.x 6af6612db -> da03f64c8
[KARAF-4904]instance:create should use next free ssh port (cherry picked from commit 6baf47d332587b45b48c4f899aa2a12c92e1fc00) Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/da03f64c Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/da03f64c Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/da03f64c Branch: refs/heads/karaf-4.0.x Commit: da03f64c8dd81b9059eb6f581d444f1ab230feaf Parents: 6af6612 Author: Freeman Fang <[email protected]> Authored: Thu Dec 22 13:15:20 2016 +0800 Committer: Freeman Fang <[email protected]> Committed: Thu Dec 22 13:17:27 2016 +0800 ---------------------------------------------------------------------- .../instance/core/internal/InstanceServiceImpl.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/da03f64c/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java ---------------------------------------------------------------------- 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 6372b8a..f8ec6d8 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 @@ -105,6 +105,22 @@ public class InstanceServiceImpl implements InstanceService { int defaultRmiRegistryPortStart = 1099; int defaultRmiServerPortStart = 44444; Map<String, InstanceState> instances; + public State() { + //read port start value from the root instance configuration + try { + Properties shellProperty = new Properties(); + shellProperty.load(new FileInputStream(new File(System.getProperty("karaf.etc"), "org.apache.karaf.shell.cfg"))); + defaultSshPortStart = Integer.valueOf((String)shellProperty.getOrDefault("sshPort", 8101)); + Properties managementProperty = new Properties(); + managementProperty.load(new FileInputStream(new File(System.getProperty("karaf.etc"), "org.apache.karaf.management.cfg"))); + defaultRmiRegistryPortStart = Integer.valueOf((String)managementProperty.getOrDefault("rmiRegistryPort", 1099)); + defaultRmiServerPortStart = Integer.valueOf((String)managementProperty.getOrDefault("rmiServerPort", 1099)); + } catch (Exception e) { + LOGGER.debug("Could not read port start value from the root instance configuration.", e); + } + } + + } public InstanceServiceImpl() {
