From 82e8fb33a01c9da54fab6bf1cbde7721ad2c2895 Mon Sep 17 00:00:00 2001
From: pr1n19 <pr1n19@soton.ac.uk>
Date: Wed, 27 Apr 2022 23:59:45 +0100
Subject: [PATCH] Updated messages to controller from "write" to "println" and
"flush"
---
src/DStore.java | 6 ++++--
src/StoreThread.java | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/DStore.java b/src/DStore.java
index cd03957..70e2c73 100644
--- a/src/DStore.java
+++ b/src/DStore.java
@@ -20,7 +20,8 @@ public class DStore {
controller = new PrintWriter(socket.getOutputStream());
//Send "JOIN port" to controller
- controller.write("JOIN "+port);
+ controller.println("JOIN "+port);
+ controller.flush();
//New thread to listen for "LIST" & "REMOVE FILENAME"
new Thread(() -> {
@@ -105,7 +106,8 @@ public class DStore {
}
//Return value
- controller.write(stringList.toString());
+ controller.println(stringList);
+ controller.flush();
}
private static void removeFile(String filePath, String fileName){
diff --git a/src/StoreThread.java b/src/StoreThread.java
index acf853c..e9938b5 100644
--- a/src/StoreThread.java
+++ b/src/StoreThread.java
@@ -36,7 +36,8 @@ public class StoreThread implements Runnable{
fileOutput.write(buf);
//Send completion ack to controller
- controller.write("STORE_ACK "+fileName);
+ controller.println("STORE_ACK "+fileName);
+ controller.flush();
//Close file output
fileOutput.close();
--
GitLab