(bookkeeper) branch master updated: compatible fix wrong key for getHttpServerTrustStorePassword (#4301)

[nicoloboschi]

This is an automated email from the ASF dual-hosted git repository.

nicoloboschi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new e2b5e1a2d0 compatible fix wrong key for 
getHttpServerTrustStorePassword (#4301)
e2b5e1a2d0 is described below

commit e2b5e1a2d0126ab506902dc0e35f4e816bd43eac
Author: ZhangJian He <shoot...@gmail.com>
AuthorDate: Fri Apr 19 18:23:03 2024 +0800

    compatible fix wrong key for getHttpServerTrustStorePassword (#4301)
    
    Signed-off-by: ZhangJian He <shoot...@gmail.com>
---
 .../main/java/org/apache/bookkeeper/conf/ServerConfiguration.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git 
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
 
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
index 5b12a8f9e4..51e45dc6f8 100644
--- 
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
+++ 
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
@@ -3706,6 +3706,12 @@ public class ServerConfiguration extends 
AbstractConfiguration<ServerConfigurati
      * @return http server trustStore password
      */
     public String getHttpServerTrustStorePassword() {
+        String serverTrustStorePassword = 
getString(HTTP_SERVER_TRUST_STORE_PASSWORD);
+        if (serverTrustStorePassword != null) {
+            return serverTrustStorePassword;
+        }
+        // mistake introduced in https://github.com/apache/bookkeeper/pull/2995
+        // will remove in next major version
         return getString(HTTP_SERVER_KEY_STORE_PASSWORD);
     }