Improvement - natMap doesn't support port mapping

redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java

@@ -686,8 +686,12 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager {
         return result;
     }
 
+    @Override
     public RedisURI applyNatMap(RedisURI address) {
         String mappedAddress = natMap.get(address.getHost() + ":" + address.getPort());
+        if (mappedAddress == null && natMap.get(address.getHost()) != null) {
+            mappedAddress = natMap.get(address.getHost()) + ":" + address.getPort();
+        }
         if (mappedAddress != null) {
             return new RedisURI(address.getScheme() + "://" + mappedAddress);
         }

redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java

@@ -637,8 +637,8 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
 
     private String applyNatMap(String ip, int port) {
         String mappedAddress = natMap.get(ip + ":" + port);
-        if (mappedAddress == null) {
-            mappedAddress = natMap.get(ip);
+        if (mappedAddress == null && natMap.get(ip) != null) {
+            mappedAddress = natMap.get(ip) + ":" + port;
         }
         if (mappedAddress != null) {
             return mappedAddress;