Merge remote-tracking branch 'origin/master'

src/Main.java

@@ -10,7 +10,7 @@ import java.util.concurrent.Executors;
 public class Main {
     public static ExecutorService executor;
 
-    public static void main(String[] args)  {
+    public static void main(String[] args) {
         executor = Executors.newFixedThreadPool(2);
         Director director = new Director();
         ServerBuilder builder = new ServerBuilder(args);

src/server/SendToReplica.java

@@ -47,10 +47,10 @@ public class SendToReplica implements Closeable {
             byte[] commandBytes = command.getBytes();
             connectedReplicas.forEach(replica -> {
                 try {
-                    try (OutputStream outputStream = replica.os()) {
-                        outputStream.write(commandBytes);
-                        outputStream.flush();
-                    }
+                    OutputStream outputStream = replica.os();
+                    outputStream.write(commandBytes);
+                    outputStream.flush();
+
                 } catch (IOException e) {
                     logger.log(Level.SEVERE, "Failed to send command to replica ", e);
                 }
@@ -67,7 +67,6 @@ public class SendToReplica implements Closeable {
     }
 
 
-
     public void addConnection(OutputStream outputStream) {
         connectedReplicas.add(new ConnectedReplica(outputStream));
         logger.info("SIZE CONNECTED REPLICAS = " + connectedReplicas.size());

src/server/ServerBuilder.java

@@ -8,7 +8,7 @@ import java.util.Map;
 import java.util.Optional;
 
 public class ServerBuilder {
-    private int port = 16380;
+    private int port = 16379;
     private String role;
     private final String[] masterPortAndHost;
     private final static ServerInfo info = ServerInfo.getInstance();

src/util/RdbFileInfo.java

@@ -51,7 +51,7 @@ public class RdbFileInfo {
     }
 
     public void setFile(Map<String, String> parameters) {
-        String path = "C:\\Users\\Amir\\Desktop\\Projects\\Redis\\tmp";
+        String path = "C:\\Users\\Amir\\Desktop\\Games\\Redis\\tmp\\";
         String fileName = "rdb.rdb";
         out.println(parameters);
         if (parameters.containsKey("--dir")) {