diff --git a/src/edu/nps/moves/dis7/utilities/DisThreadedNetworkInterface.java b/src/edu/nps/moves/dis7/utilities/DisThreadedNetworkInterface.java index 5838163b6feb3f44355b4951c9b77c70c7634670..c8aebfc5f1bf80d20c1e87ce435bf44128b6b291 100644 --- a/src/edu/nps/moves/dis7/utilities/DisThreadedNetworkInterface.java +++ b/src/edu/nps/moves/dis7/utilities/DisThreadedNetworkInterface.java @@ -153,7 +153,7 @@ public class DisThreadedNetworkInterface } catch (UnknownHostException ex) { - Logger.getLogger(DisThreadedNetworkInterface.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(DisThreadedNetworkInterface.class.getSimpleName()).log(Level.SEVERE, null, ex); } inetSocket = new InetSocketAddress(inetAddress, disPort); // tests that accessor methods are working as set networkInterface = findIpv4Interface(); @@ -431,7 +431,7 @@ public class DisThreadedNetworkInterface pad = " "; String message = TRACE_PREFIX + "[receipt " + pad + pduReceiptCounter + "] " + nextPdu.getPduType().toString(); if (hasVerboseOutputIncludesTimestamp()) - message += " (timestamp " + DisTime.timestampToString(nextPdu.getTimestamp()); + message += " (timestamp " + DisTime.convertToString(nextPdu.getTimestamp()); if (nextPdu.getPduType() == DisPduType.ENTITY_STATE) message += " " + String.format("%11s", ((EntityStatePdu)nextPdu).getMarkingString()); message += ", size " + nextPdu.getMarshalledSize() + " bytes)"; @@ -480,7 +480,7 @@ public class DisThreadedNetworkInterface pad = " "; String message = TRACE_PREFIX + "[sending " + pad + pduSentCounter + "] " + nextPdu.getPduType().toString(); if (hasVerboseOutputIncludesTimestamp()) - message += " (timestamp " + DisTime.timestampToString(nextPdu.getTimestamp()); + message += " (timestamp " + DisTime.convertToString(nextPdu.getTimestamp()); if (nextPdu.getPduType() == DisPduType.ENTITY_STATE) message += " " + String.format("%11s", ((EntityStatePdu)nextPdu).getMarkingString()); message += ", size " + nextPdu.getMarshalledSize() + " bytes)"; diff --git a/src/edu/nps/moves/dis7/utilities/DisThreadedNetworkInterfaceSelfTestLog.txt b/src/edu/nps/moves/dis7/utilities/DisThreadedNetworkInterfaceSelfTestLog.txt index 520fbfaa692a7a52f1db1a30b9c5c042664d25e9..8f331058620c50e6d7f0994ebd61006cd856cadc 100644 --- a/src/edu/nps/moves/dis7/utilities/DisThreadedNetworkInterfaceSelfTestLog.txt +++ b/src/edu/nps/moves/dis7/utilities/DisThreadedNetworkInterfaceSelfTestLog.txt @@ -9,7 +9,7 @@ warning: [options] bootstrap class path not set in conjunction with -source 8 compile-single: run-single: [DisThreadedNetworkInterface] main() started... -[DisThreadedNetworkInterface] using network interface Intel(R) Wi-Fi 6E AX210 160MHz +[DisThreadedNetworkInterface] using network interface PANGP Virtual Ethernet Adapter [DisThreadedNetworkInterface main() self test] datagramSocket.joinGroup address=239.1.2.3 port=3000 isConnected()=false createDatagramSocket() complete. [DisThreadedNetworkInterface main() self test] createThreads() receiveThread.isAlive()=true [DisThreadedNetworkInterface main() self test] createThreads() sendingThread.isAlive()=true @@ -18,7 +18,7 @@ run-single: [DisThreadedNetworkInterface main() self test] [sending 1] DisPduType 01 ENTITY_STATE self test, size 144 bytes) [DisThreadedNetworkInterface main() self test] [receipt 1] DisPduType 01 ENTITY_STATE self test, size 144 bytes) [DisThreadedNetworkInterface main() self test] main() pduListener.incomingPdu() received newPdu DisPduType 01 ENTITY_STATE -*** setKillSentinelAndInterrupts() killed=true sendingThread.isInterrupted()=true receiveThread.isInterrupted()=true +*** setKillSentinelAndInterrupts() killed=true sendingThread.isInterrupted()=false receiveThread.isInterrupted()=true [DisThreadedNetworkInterface main() self test] close(): pdus2send.size()=0 baos.size()=0 dos.size()=144 [DisThreadedNetworkInterface main() self test] datagramSocket.leaveGroup address=239.1.2.3 port=3000 isClosed()=true close() complete. *** killThread() status: sendingThread.isAlive()=false sendingThread.isInterrupted()=true