Update hbase/stackable/patches/2.6.1/0005-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch

adwk67 · nightkr · web-flow · commit f08e1c56d5ae · 2025-06-24T17:44:46.000+02:00
Co-authored-by: Natalie Klestrup Röijezon &lt;nat@nullable.se&gt;
diff --git a/hbase/stackable/patches/2.6.1/0005-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch b/hbase/stackable/patches/2.6.1/0005-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch
@@ -27,7 +27,8 @@ index 3fe5abac27..6d40db77ae 100644
  
 +  @Override
 +  protected int getUseThisPortInstead(Configuration conf) {
-+    return conf.getInt(MASTER_PORT, this.rpcServices.getSocketAddress().getPort());
++    int port = conf.getInt(MASTER_PORT, 0);
++    return port != 0 ? port : this.rpcServices.getSocketAddress().getPort();
 +  }
 +
    private void registerConfigurationObservers() {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ index 3fe5abac27..6d40db77ae 100644`
`27`	`27`
`28`	`28`	`+ @Override`
`29`	`29`	`+ protected int getUseThisPortInstead(Configuration conf) {`
`30`		`-+ return conf.getInt(MASTER_PORT, this.rpcServices.getSocketAddress().getPort());`
	`30`	`++ int port = conf.getInt(MASTER_PORT, 0);`
	`31`	`++ return port != 0 ? port : this.rpcServices.getSocketAddress().getPort();`
`31`	`32`	`+ }`
`32`	`33`	`+`
`33`	`34`	`private void registerConfigurationObservers() {`