From f79a42aef62fe1d122de08b9fea09771cd6682c2 Mon Sep 17 00:00:00 2001 From: bkii <bkii@10.0.0.123> Date: Wed, 11 Sep 2019 20:30:07 -0700 Subject: [PATCH] Done! --- .../BRE_KNO_MCC/BRE_KNO_MCC_PC1_MCAST_PduSender.java | 6 +++--- .../BRE_KNO_MCC/BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java | 1 + .../BRE_KNO_MCC/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC1_MCAST_PduSender.java b/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC1_MCAST_PduSender.java index b15a5ba40e..954cf2cd39 100755 --- a/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC1_MCAST_PduSender.java +++ b/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC1_MCAST_PduSender.java @@ -15,13 +15,13 @@ public class BRE_KNO_MCC_PC1_MCAST_PduSender public static final int DEFAULT_MULTICAST_PORT = 2342; static boolean keepRunning = true; - + int senderIntervall = 0; public void run(int numbOfPDUS) { System.out.println("BRE_KNO_MCC_PC1_MCAST_PduSender started..."); System.out.println("Generate PDUs and note issues, if any..."); - int senderIntervall = 0; + while (keepRunning){ List<Pdu> generatedPdusList = createPDU(numbOfPDUS, senderIntervall); @@ -105,7 +105,7 @@ public class BRE_KNO_MCC_PC1_MCAST_PduSender payloadList.add(newVariableDatum); } newCommentPdu.setVariableDatums(payloadList); - newCommentPdu.setTimestamp(42 + intervall*5); + newCommentPdu.setTimestamp((i + (intervall * 5))); Pdu aPdu = newCommentPdu; list.add(aPdu); diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java index fadd1bb5fe..968ca2b89c 100644 --- a/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java +++ b/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java @@ -53,6 +53,7 @@ public class BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver extends Thread try { mutex.acquire(); + System.out.println("PC2 - PC1 received: Internal ID " + pdu.getTimestamp() + " added."); mcastMessagesToSend.add(pdu); mutex.release(); diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java b/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java index fcf17daf29..250bf5c996 100755 --- a/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java +++ b/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java @@ -40,7 +40,7 @@ public class BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender extends Thread if (!messagesToSend.isEmpty()) { Pdu tempPdu = messagesToSend.get(0); - messagesToSend.remove(0); + messagesToSend.remove(messagesToSend.get(0)); mutex.release(); if (tempPdu.getPduType() != DISPDUType.COMMENT) -- GitLab