Removed forks

Author: shai-almog

CodenameOne/src/com/codename1/io/NetworkManager.java

@@ -430,38 +430,31 @@ public void actionPerformed(NetworkEvent e) {
     public void addToQueueAndWait(final ConnectionRequest request) {
         class WaitingClass implements Runnable, ActionListener<NetworkEvent> {
             private final boolean edt = CN.isEdt();
-
-            private boolean isInQueueOrProcessing() {
-                synchronized (LOCK) {
-                    if(pending == null || networkThreads == null) {
-                        return false;
-                    }
-                    if(pending.contains(request)) {
-                        return true;
-                    }
-                    for(NetworkThread t : networkThreads) {
-                        if(t.currentRequest == request) {
-                            return true;
-                        }
-                    }
-                }
-                return false;
-            }
+            private boolean finishedWaiting;
 
             public void run() {
                 if (edt) {
-                    while (isInQueueOrProcessing()) {
-                        Util.sleep(30);
+                    while (!finishedWaiting) {
+                        try {
+                            Thread.sleep(30);
+                        } catch (InterruptedException ex) {
+                            ex.printStackTrace();
+                        }
                     }
                 } else {
-                    while (isInQueueOrProcessing()) {
-                        Util.sleep(30);
+                    while (!request.complete) {
+                        try {
+                            Thread.sleep(30);
+                        } catch (InterruptedException ex) {
+                            ex.printStackTrace();
+                        }
                     }
                 }
             }
 
             public void actionPerformed(NetworkEvent e) {
                 if (e.getError() != null) {
+                    finishedWaiting = true;
                     removeProgressListener(this);
                     removeErrorListener(this);
                     return;
@@ -472,6 +465,7 @@ public void actionPerformed(NetworkEvent e) {
                             request.retrying = false;
                             return;
                         }
+                        finishedWaiting = true;
                         removeProgressListener(this);
                         removeErrorListener(this);
                     }

maven/core-unittests/pom.xml

@@ -33,11 +33,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.2.1</version>
-                <configuration>
-                    <!-- Run each test in its own forked JVM to ensure an isolated classloader. -->
-                    <forkCount>1C</forkCount>
-                    <reuseForks>true</reuseForks>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>