Skip to content

Fix for MODCLUSTER-432 #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix for MODCLUSTER-432 #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04f03f4
Fix for MODCLUSTER-432.
jfclere Oct 7, 2014
9d5d259
Do the test only with java8 (otherwise it will fail).
jfclere Oct 7, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/org/jboss/modcluster/ModClusterLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public interface ModClusterLogger {
void sessionDrainTimeout(int sessions, Host host, Context context, float seconds);

@LogMessage(level = WARN)
@Message(id = 30, value = "Attempted to bind multicast socket to a unicast address: %s. Multicast socket will not be bound to an address.")
@Message(id = 30, value = "Attempted to bind multicast socket to a multicast address: %s. Multicast socket will not be bound to an address.")
void createMulticastSocketWithUnicastAddress(InetAddress address);

@LogMessage(level = WARN)
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/jboss/modcluster/advertise/impl/MulticastSocketFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public String run() {
public MulticastSocket createMulticastSocket(InetAddress address, int port) throws IOException {
if ((address == null) || !this.linuxlike) return new MulticastSocket(port);

if (!address.isMulticastAddress()) {
if (address.isMulticastAddress()) {
ModClusterLogger.LOGGER.createMulticastSocketWithUnicastAddress(address);
return new MulticastSocket(port);
}
Expand Down
3 changes: 2 additions & 1 deletion core/src/test/java/org/jboss/modcluster/advertise/MulticastSocketFactoryImplTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ public void testMulticastSocketNoCrossTalk() throws IOException {

this.testMulticastSocket(socket, address, true);
// Test for cross-talking
this.testMulticastSocket(socket, InetAddress.getByName(GROUP2), false);
if (Double.parseDouble(System.getProperty("java.specification.version")) >= 1.8)
this.testMulticastSocket(socket, InetAddress.getByName(GROUP2), false);

socket.leaveGroup(address);
} finally {
Expand Down