[Java]: fix hasDestination check to avoid situation of 1 destination …

…but not at 0. Use subscriptionUdpChannel where needed & use transportIndex for multicast implicit check on creating images.
jh0x · Jul 12, 2022 · b545e22 · b545e22
1 parent 68feef7
commit b545e22
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/aeron-driver/src/main/java/io/aeron/driver/DriverConductor.java b/aeron-driver/src/main/java/io/aeron/driver/DriverConductor.java
@@ -283,7 +283,7 @@ void onCreatePublicationImage(
                 rcvPos = ReceiverPos.allocate(tempBuffer, countersManager, registrationId, sessionId, streamId, uri);
 
                 final boolean treatAsMulticast = subscription.group() == INFER ?
-                    channelEndpoint.udpChannel().isMulticast() : subscription.group() == FORCE_TRUE;
+                    channelEndpoint.udpChannel(transportIndex).isMulticast() : subscription.group() == FORCE_TRUE;
 
                 final PublicationImage image = new PublicationImage(
                     registrationId,
@@ -582,7 +582,7 @@ void cleanupSubscriptionLink(final SubscriptionLink subscription)
             if (channelEndpoint.shouldBeClosed())
             {
                 receiverProxy.closeReceiveChannelEndpoint(channelEndpoint);
-                receiveChannelEndpointByChannelMap.remove(channelEndpoint.udpChannel().canonicalForm());
+                receiveChannelEndpointByChannelMap.remove(channelEndpoint.subscriptionUdpChannel().canonicalForm());
                 channelEndpoint.closeIndicators();
             }
         }
@@ -1502,7 +1502,8 @@ private void validateChannelSendTimestampOffset(
     private void validateReceiveTimestampOffset(
         final UdpChannel udpChannel, final ReceiveChannelEndpoint channelEndpoint)
     {
-        if (udpChannel.channelReceiveTimestampOffset() != channelEndpoint.udpChannel().channelReceiveTimestampOffset())
+        if (udpChannel.channelReceiveTimestampOffset() !=
+            channelEndpoint.subscriptionUdpChannel().channelReceiveTimestampOffset())
         {
             throw new InvalidChannelException(
                 "option conflicts with existing subscription: " + CHANNEL_RECEIVE_TIMESTAMP_OFFSET_PARAM_NAME + "=" +

diff --git a/aeron-driver/src/main/java/io/aeron/driver/media/MultiRcvDestination.java b/aeron-driver/src/main/java/io/aeron/driver/media/MultiRcvDestination.java
@@ -75,7 +75,7 @@ void removeDestination(final int transportIndex)
 
     boolean hasDestination(final int transportIndex)
     {
-        return numDestinations > transportIndex && null != transports[transportIndex];
+        return transports.length > transportIndex && null != transports[transportIndex];
     }
 
     ReceiveDestinationTransport transport(final int transportIndex)

diff --git a/aeron-driver/src/main/java/io/aeron/driver/media/ReceiveChannelEndpoint.java b/aeron-driver/src/main/java/io/aeron/driver/media/ReceiveChannelEndpoint.java
@@ -186,7 +186,7 @@ public int sendTo(final ByteBuffer buffer, final InetSocketAddress remoteAddress
      */
     public String originalUriString()
     {
-        return udpChannel().originalUriString();
+        return subscriptionUdpChannel().originalUriString();
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         public String originalUriString()
         {
-            return udpChannel().originalUriString();
+            return subscriptionUdpChannel().originalUriString();
         }
         /**
@@ Expand Down @@