You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tv...@apache.org on 2024/04/20 09:32:39 UTC
(commons-jcs) 01/04: Clean up a bit
This is an automated email from the ASF dual-hosted git repository.
tv pushed a commit to branch release-3.2.1
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
commit 2e2e1969c6b9119fd8ce4da9520e1a78c43d5dc9
Author: Thomas Vandahl <tv...@apache.org>
AuthorDate: Sat Apr 20 10:53:29 2024 +0200
Clean up a bit
---
.../apache/commons/jcs3/utils/net/HostNameUtil.java | 3 ++-
.../jcs3/utils/discovery/UDPDiscoveryUnitTest.java | 19 ++++++++-----------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/utils/net/HostNameUtil.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/utils/net/HostNameUtil.java
index 509f196b..62cec7f9 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/utils/net/HostNameUtil.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/utils/net/HostNameUtil.java
@@ -200,13 +200,14 @@ public class HostNameUtil
final NetworkInterface networkInterface = networkInterfaces.nextElement();
if (!networkInterface.supportsMulticast())
{
+ log.trace("found network interface [{0}]: no multicast support", networkInterface::getDisplayName);
continue;
}
final Enumeration<InetAddress> addressesFromNetworkInterface = networkInterface.getInetAddresses();
while (addressesFromNetworkInterface.hasMoreElements())
{
final InetAddress inetAddress = addressesFromNetworkInterface.nextElement();
- log.debug("found network interface [{0}]: address: {1}, site local: {2}, any local {3}, link local {4}, loopback {5}, multicast {6}",
+ log.trace("found network interface [{0}]: address: {1}, site local: {2}, any local {3}, link local {4}, loopback {5}, multicast {6}",
networkInterface::getDisplayName, inetAddress::getHostAddress, inetAddress::isSiteLocalAddress,
inetAddress::isAnyLocalAddress, inetAddress::isLinkLocalAddress, inetAddress::isLoopbackAddress,
inetAddress::isMulticastAddress);
diff --git a/commons-jcs-core/src/test/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryUnitTest.java b/commons-jcs-core/src/test/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryUnitTest.java
index fc531fa6..5087aca0 100644
--- a/commons-jcs-core/src/test/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryUnitTest.java
+++ b/commons-jcs-core/src/test/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryUnitTest.java
@@ -1,8 +1,5 @@
package org.apache.commons.jcs3.utils.discovery;
-import java.io.IOException;
-import java.net.NetworkInterface;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -22,6 +19,7 @@ import java.net.NetworkInterface;
* under the License.
*/
+import java.io.IOException;
import java.util.ArrayList;
import org.apache.commons.jcs3.utils.net.HostNameUtil;
@@ -38,10 +36,10 @@ public class UDPDiscoveryUnitTest
{
/**
* <p>
- * @throws Exception
+ * @throws IOException
*/
public void testSimpleUDPDiscoveryIPv4()
- throws Exception
+ throws IOException
{
if (HostNameUtil.getMulticastNetworkInterface() == null)
{
@@ -53,13 +51,12 @@ public class UDPDiscoveryUnitTest
/**
* <p>
- * @throws Exception
+ * @throws IOException
*/
public void testSimpleUDPDiscoveryIPv6()
- throws Exception
+ throws IOException
{
- NetworkInterface multicast = HostNameUtil.getMulticastNetworkInterface();
- if (multicast == null)
+ if (HostNameUtil.getMulticastNetworkInterface() == null)
{
System.out.println("This machine does not support multicast");
return;
@@ -70,10 +67,10 @@ public class UDPDiscoveryUnitTest
/**
* <p>
- * @throws Exception
+ * @throws IOException
*/
private void simpleUDPDiscovery(String discoveryAddress)
- throws Exception
+ throws IOException
{
final UDPDiscoveryAttributes attributes = new UDPDiscoveryAttributes();
attributes.setUdpDiscoveryAddr(discoveryAddress);