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 2022/12/31 06:22:38 UTC
[karaf] branch karaf-4.3.x updated: [KARAF-7610] Don't override java.rmi.server.hostname if the user already defined it
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.3.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.3.x by this push:
new 542acdcf9d [KARAF-7610] Don't override java.rmi.server.hostname if the user already defined it
542acdcf9d is described below
commit 542acdcf9d16b2284a2c408481219fa68d2ec220
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Thu Dec 22 18:09:51 2022 +0100
[KARAF-7610] Don't override java.rmi.server.hostname if the user already defined it
(cherry picked from commit 8286a9d5dc24b5a1c8c45e63962455b6bbda12c7)
---
.../org/apache/karaf/management/internal/Activator.java | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/management/server/src/main/java/org/apache/karaf/management/internal/Activator.java b/management/server/src/main/java/org/apache/karaf/management/internal/Activator.java
index d27a290b9b..7b94c212e1 100644
--- a/management/server/src/main/java/org/apache/karaf/management/internal/Activator.java
+++ b/management/server/src/main/java/org/apache/karaf/management/internal/Activator.java
@@ -61,8 +61,6 @@ public class Activator extends BaseActivator implements ManagedService {
private EventAdminLogger eventAdminLogger;
- private String originalRmiServerHostname;
-
protected void doStart() throws Exception {
// Verify dependencies
ConfigurationAdmin configurationAdmin = getTrackedService(ConfigurationAdmin.class);
@@ -107,8 +105,12 @@ public class Activator extends BaseActivator implements ManagedService {
// RMIServerImpl_Stub side of RMI object takes the address from java.rmi.server.hostname property.
// Because Karaf "takes over" entire RMI registry anyway, we have to change this property here and restore in
// doStop();
- originalRmiServerHostname = System.getProperty("java.rmi.server.hostname");
- System.setProperty("java.rmi.server.hostname", rmiServerHost);
+ if (System.getProperty("java.rmi.server.hostname") != null) {
+ LOG.warn("java.rmi.server.hostname system property is already set to {}. Apache Karaf doesn't override it", System.getProperty("java.rmi.server.hostname"));
+ } else {
+ LOG.info("Setting java.rmi.server.hostname system property to {}", rmiServerHost);
+ System.setProperty("java.rmi.server.hostname", rmiServerHost);
+ }
// https://issues.apache.org/jira/browse/KARAF-7312
// security enforcement using credentials filter pattern, passed via environment map
@@ -264,12 +266,6 @@ public class Activator extends BaseActivator implements ManagedService {
eventAdminLogger = null;
}
}
-
- if (originalRmiServerHostname != null) {
- System.setProperty("java.rmi.server.hostname", originalRmiServerHostname);
- } else {
- System.clearProperty("java.rmi.server.hostname");
- }
}
}