[WIP] First attempt at fixing second jabref instance detection

src/main/java/org/jabref/JabRefMain.java

@@ -70,7 +70,6 @@ public void start(Stage mainStage) throws Exception {
             // Check for running JabRef
             if (!handleMultipleAppInstances(arguments) || argumentProcessor.shouldShutDown()) {
                 Platform.exit();
-                return;
             }
 
             // If not, start GUI
@@ -79,13 +78,13 @@ public void start(Stage mainStage) throws Exception {
             LOGGER.error("Unexpected exception", ex);
         }
     }
-  
+
     @Override
     public void stop() {
         Globals.stopBackgroundTasks();
         Globals.shutdownThreadPools();
     }
-  
+
     /**
      * Tests if we are running an acceptable Java and terminates JabRef when we are sure the version is not supported.
      * This test uses the requirements for the Java version as specified in <code>gradle.build</code>. It is possible to

src/main/java/org/jabref/gui/remote/JabRefMessageHandler.java

@@ -1,6 +1,5 @@
 package org.jabref.gui.remote;
 
-import java.util.Arrays;
 import java.util.List;
 
 import org.jabref.JabRefGUI;
@@ -13,9 +12,6 @@ public class JabRefMessageHandler implements MessageHandler {
     @Override
     public void handleCommandLineArguments(String[] message) {
         ArgumentProcessor argumentProcessor = new ArgumentProcessor(message, ArgumentProcessor.Mode.REMOTE_START);
-        if (!(argumentProcessor.hasParserResults())) {
-            throw new IllegalStateException("Could not start JabRef with arguments " + Arrays.toString(message));
-        }
 
         List<ParserResult> loaded = argumentProcessor.getParserResults();
         for (int i = 0; i < loaded.size(); i++) {

src/main/java/org/jabref/logic/remote/client/RemoteClient.java

@@ -17,8 +17,8 @@ public class RemoteClient {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RemoteClient.class);
 
-    private static final int TIMEOUT = 2000;
-    private int port;
+    private static final int TIMEOUT = 5000;
+    private final int port;
 
     public RemoteClient(int port) {
         this.port = port;
@@ -29,7 +29,7 @@ public boolean ping() {
             protocol.sendMessage(RemoteMessage.PING);
             Pair<RemoteMessage, Object> response = protocol.receiveMessage();
 
-            if (response.getKey() == RemoteMessage.PONG && Protocol.IDENTIFIER.equals(response.getValue())) {
+            if ((response.getKey() == RemoteMessage.PONG) && Protocol.IDENTIFIER.equals(response.getValue())) {
                 return true;
             } else {
                 String port = String.valueOf(this.port);
@@ -47,7 +47,7 @@ public boolean ping() {
      * Attempt to send command line arguments to already running JabRef instance.
      *
      * @param args command line arguments.
-     * @return true if successful, false otherwise.
+     * @return true
      */
     public boolean sendCommandLineArguments(String[] args) {
         try (Protocol protocol = openNewConnection()) {
@@ -56,7 +56,7 @@ public boolean sendCommandLineArguments(String[] args) {
             return response.getKey() == RemoteMessage.OK;
         } catch (IOException e) {
             LOGGER.debug("Could not send args " + String.join(", ", args) + " to the server at port " + port, e);
-            return false;
+            return true;
         }
     }