From c32dace121b2d05e13d2e6c363447b4320db96df Mon Sep 17 00:00:00 2001
From: multi <multi@DURANROG>
Date: Fri, 27 May 2022 10:48:08 -0700
Subject: [PATCH] Merge origin/master
Conflicts:
README.md
---
.../homework2/Duran/DuranTcpExample3Client.java | 5 +----
.../homework2/Duran/DuranTcpExampleServer.java | 7 ++-----
.../homework2/Marks/MarksTcpExample3Client.java | 5 +----
.../homework2/Marks/MarksTcpExampleServer.java | 5 +----
4 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/assignments/src/MV3500Cohort2022MayJune/homework2/Duran/DuranTcpExample3Client.java b/assignments/src/MV3500Cohort2022MayJune/homework2/Duran/DuranTcpExample3Client.java
index bea70ccbb2..a6acefb9a2 100644
--- a/assignments/src/MV3500Cohort2022MayJune/homework2/Duran/DuranTcpExample3Client.java
+++ b/assignments/src/MV3500Cohort2022MayJune/homework2/Duran/DuranTcpExample3Client.java
@@ -3,10 +3,7 @@ import MV3500Cohort2021JulySeptember.homework2.Domonique.*;
import java.io.*;
import java.net.*;
-/**
- * Hey why not say what this thing does...
- * @author Dom Hittner
- */
+
public class DuranTcpExample3Client {
/** IPv6 String constant for localhost address, similarly IPv4 127.0.0.1
diff --git a/assignments/src/MV3500Cohort2022MayJune/homework2/Duran/DuranTcpExampleServer.java b/assignments/src/MV3500Cohort2022MayJune/homework2/Duran/DuranTcpExampleServer.java
index a95674e9a0..1120aac11e 100644
--- a/assignments/src/MV3500Cohort2022MayJune/homework2/Duran/DuranTcpExampleServer.java
+++ b/assignments/src/MV3500Cohort2022MayJune/homework2/Duran/DuranTcpExampleServer.java
@@ -4,10 +4,7 @@ import MV3500Cohort2021JulySeptember.homework2.Domonique.*;
import java.io.*;
import java.net.*;
-/**
- * homework assignment
- * @author Dom Hittner
- */
+
public class DuranTcpExampleServer {
/**
@@ -44,7 +41,7 @@ public class DuranTcpExampleServer {
// Now hook everything up (i.e. set up the streams), Java style:
os = clientConnectionSocket.getOutputStream();
ps = new PrintStream(os);
- ps.println("okay " + serverLoopCount + " let's go to Starbucks"); // this gets sent back to client!
+ ps.println("now " + serverLoopCount + " i am connected"); // this gets sent back to client!
// Print some information locally about the Socket connection.
// This includes the port and IP numbers on both sides (the socket pair).
diff --git a/assignments/src/MV3500Cohort2022MayJune/homework2/Marks/MarksTcpExample3Client.java b/assignments/src/MV3500Cohort2022MayJune/homework2/Marks/MarksTcpExample3Client.java
index 9784300f84..9ca8e97137 100644
--- a/assignments/src/MV3500Cohort2022MayJune/homework2/Marks/MarksTcpExample3Client.java
+++ b/assignments/src/MV3500Cohort2022MayJune/homework2/Marks/MarksTcpExample3Client.java
@@ -4,10 +4,7 @@ import MV3500Cohort2021JulySeptember.homework2.Domonique.*;
import java.io.*;
import java.net.*;
-/**
- * Hey why not say what this thing does...
- * @author Dom Hittner
- */
+
public class MarksTcpExample3Client {
/** IPv6 String constant for localhost address, similarly IPv4 127.0.0.1
diff --git a/assignments/src/MV3500Cohort2022MayJune/homework2/Marks/MarksTcpExampleServer.java b/assignments/src/MV3500Cohort2022MayJune/homework2/Marks/MarksTcpExampleServer.java
index 50fb7de55b..2d15f1c8ea 100644
--- a/assignments/src/MV3500Cohort2022MayJune/homework2/Marks/MarksTcpExampleServer.java
+++ b/assignments/src/MV3500Cohort2022MayJune/homework2/Marks/MarksTcpExampleServer.java
@@ -5,10 +5,7 @@ import MV3500Cohort2021JulySeptember.homework2.Domonique.*;
import java.io.*;
import java.net.*;
-/**
- * homework assignment
- * @author Dom Hittner
- */
+
public class MarksTcpExampleServer {
/**
--
GitLab