Merge pull request taimos#20 from 21Net/master

hoegertn · hoegertn · commit 6f2bc1797d88 · 2015-12-22T07:33:28.000+01:00
race condition between calling thread and SocketThread
diff --git a/src/main/java/de/taimos/gpsd4java/backend/GPSdEndpoint.java b/src/main/java/de/taimos/gpsd4java/backend/GPSdEndpoint.java
@@ -66,7 +66,7 @@ public class GPSdEndpoint {
 	
 	private final List<IObjectListener> listeners = new ArrayList<IObjectListener>(1);
 	
-	private IGPSObject asnycResult = null;
+	private IGPSObject asyncResult = null;
 	
 	private final Object asyncMutex = new Object();
 	
@@ -255,17 +255,17 @@ private void voidCommand(final String command) throws IOException {
 	 */
 	private IGPSObject waitForResult() {
 		synchronized (this.asyncWaitMutex) {
-			this.asnycResult = null;
-			try {
-				this.asyncWaitMutex.wait(1000);
-			} catch (final InterruptedException e) {
-				GPSdEndpoint.LOG.info("Interrupted while waiting for result", e);
-			}
-			if (this.asnycResult != null) {
-				return this.asnycResult;
+			if (this.asyncResult == null) {
+				try {
+					this.asyncWaitMutex.wait(1000);
+				} catch (final InterruptedException e) {
+					GPSdEndpoint.LOG.info("Interrupted while waiting for result", e);
+				}
 			}
+			final IGPSObject result = this.asyncResult;
+			this.asyncResult = null;
+			return result;
 		}
-		return null;
 	}
 	
 	/*
@@ -299,7 +299,7 @@ void handle(final IGPSObject object) {
 		} else {
 			// object was requested, so put it in the response object
 			synchronized (this.asyncWaitMutex) {
-				this.asnycResult = object;
+				this.asyncResult = object;
 				this.asyncWaitMutex.notifyAll();
 			}
 		}
