From 73de927bd52ec9f6b43ec0e3e0debecc47ac1b07 Mon Sep 17 00:00:00 2001
From: nathan <nathan@dorkbox.com>
Date: Fri, 9 Feb 2018 22:37:09 +0100
Subject: [PATCH] Removed unnecessary flush() commands

---
 src/dorkbox/network/rmi/RmiBridge.java             |  3 +--
 src/dorkbox/network/rmi/RmiObjectLocalHandler.java |  6 ++----
 .../network/rmi/RmiObjectNetworkHandler.java       |  6 ++----
 src/dorkbox/network/rmi/RmiProxyHandler.java       | 14 +++-----------
 4 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/dorkbox/network/rmi/RmiBridge.java b/src/dorkbox/network/rmi/RmiBridge.java
index 1bf8c97c..860334ab 100644
--- a/src/dorkbox/network/rmi/RmiBridge.java
+++ b/src/dorkbox/network/rmi/RmiBridge.java
@@ -294,8 +294,7 @@ class RmiBridge {
 
         // System.err.println("Sending: " + invokeMethod.responseID);
         connection.send()
-                  .TCP(invokeMethodResult)
-                  .flush();
+                  .TCP(invokeMethodResult);
 
         // logger.error("{} sent data: {}  with id ({})", connection, result, invokeMethod.responseID);
     }
diff --git a/src/dorkbox/network/rmi/RmiObjectLocalHandler.java b/src/dorkbox/network/rmi/RmiObjectLocalHandler.java
index cf88ff4a..51ce3b23 100644
--- a/src/dorkbox/network/rmi/RmiObjectLocalHandler.java
+++ b/src/dorkbox/network/rmi/RmiObjectLocalHandler.java
@@ -149,8 +149,7 @@ class RmiObjectLocalHandler extends RmiObjectHandler {
                 Class<?> rmiImpl = serialization.getRmiImpl(registration.interfaceClass);
 
                 RmiRegistration registrationResult = connection.createNewRmiObject(interfaceClass, rmiImpl, callbackId);
-                connection.TCP(registrationResult)
-                          .flush();
+                connection.TCP(registrationResult);
             }
 
             // Check if we are getting an already existing REMOTE object. This check is always AFTER the check to create a new object
@@ -160,8 +159,7 @@ class RmiObjectLocalHandler extends RmiObjectHandler {
                 // GET a LOCAL rmi object, if none get a specific, GLOBAL rmi object (objects that are not bound to a single connection).
                 RmiRegistration registrationResult = connection.getExistingRmiObject(interfaceClass, registration.rmiId, callbackId);
 
-                connection.TCP(registrationResult)
-                          .flush();
+                connection.TCP(registrationResult);
             }
         }
         else {
diff --git a/src/dorkbox/network/rmi/RmiObjectNetworkHandler.java b/src/dorkbox/network/rmi/RmiObjectNetworkHandler.java
index 89d787ee..bc51573d 100644
--- a/src/dorkbox/network/rmi/RmiObjectNetworkHandler.java
+++ b/src/dorkbox/network/rmi/RmiObjectNetworkHandler.java
@@ -56,8 +56,7 @@ class RmiObjectNetworkHandler extends RmiObjectHandler {
 
                 // For network connections, the interface class kryo ID == implementation class kryo ID, so they switch automatically.
                 RmiRegistration registrationResult = connection.createNewRmiObject(interfaceClass, interfaceClass, callbackId);
-                connection.TCP(registrationResult)
-                          .flush();
+                connection.TCP(registrationResult);
             }
 
             // Check if we are getting an already existing REMOTE object. This check is always AFTER the check to create a new object
@@ -66,8 +65,7 @@ class RmiObjectNetworkHandler extends RmiObjectHandler {
                 //
                 // GET a LOCAL rmi object, if none get a specific, GLOBAL rmi object (objects that are not bound to a single connection).
                 RmiRegistration registrationResult = connection.getExistingRmiObject(interfaceClass, registration.rmiId, callbackId);
-                connection.TCP(registrationResult)
-                          .flush();
+                connection.TCP(registrationResult);
             }
         }
         else {
diff --git a/src/dorkbox/network/rmi/RmiProxyHandler.java b/src/dorkbox/network/rmi/RmiProxyHandler.java
index dca25fe3..cbb0fa7b 100644
--- a/src/dorkbox/network/rmi/RmiProxyHandler.java
+++ b/src/dorkbox/network/rmi/RmiProxyHandler.java
@@ -46,11 +46,7 @@ import java.util.concurrent.locks.ReentrantLock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import dorkbox.network.connection.Connection;
-import dorkbox.network.connection.ConnectionImpl;
-import dorkbox.network.connection.EndPoint;
-import dorkbox.network.connection.KryoExtra;
-import dorkbox.network.connection.Listener;
+import dorkbox.network.connection.*;
 import dorkbox.network.serialization.RmiSerializationManager;
 
 /**
@@ -279,14 +275,10 @@ class RmiProxyHandler implements InvocationHandler {
 
         // Sends our invokeMethod to the remote connection, which the RmiBridge listens for
         if (this.udp) {
-            this.connection.send()
-                           .UDP(invokeMethod)
-                           .flush();
+            this.connection.UDP(invokeMethod);
         }
         else {
-            this.connection.send()
-                           .TCP(invokeMethod)
-                           .flush();
+            this.connection.TCP(invokeMethod);
         }
 
         if (logger.isTraceEnabled()) {