Changed to a fifo queue

5 files changed, 7 insertions, 61 deletions

diff --git a/sdl_android_lib/src/com/smartdevicelink/Dispatcher/IncomingProtocolMessageComparitor.java b/sdl_android_lib/src/com/smartdevicelink/Dispatcher/IncomingProtocolMessageComparitor.java
deleted file mode 100644
index fd80a5e15..000000000
--- a/sdl_android_lib/src/com/smartdevicelink/Dispatcher/IncomingProtocolMessageComparitor.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.smartdevicelink.Dispatcher;

-

-import java.util.Comparator;

-

-import com.smartdevicelink.protocol.ProtocolMessage;

-

-public class IncomingProtocolMessageComparitor implements Comparator<ProtocolMessage> {

-

-	@Override

-	public int compare(ProtocolMessage arg0, ProtocolMessage arg1) {

-		// Always return 0, turning the priority queue into a FIFO queue. 

-		return 0;

-	}

-}

diff --git a/sdl_android_lib/src/com/smartdevicelink/Dispatcher/InternalProxyMessageComparitor.java b/sdl_android_lib/src/com/smartdevicelink/Dispatcher/InternalProxyMessageComparitor.java
deleted file mode 100644
index 36e439408..000000000
--- a/sdl_android_lib/src/com/smartdevicelink/Dispatcher/InternalProxyMessageComparitor.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.smartdevicelink.Dispatcher;

-

-import java.util.Comparator;

-

-import com.smartdevicelink.proxy.callbacks.InternalProxyMessage;

-

-public class InternalProxyMessageComparitor implements Comparator<InternalProxyMessage> {

-

-	@Override

-	public int compare(InternalProxyMessage arg0, InternalProxyMessage arg1) {

-		// Always return 0, turning the priority queue into a FIFO queue. 

-		return 0;

-	}

-}

diff --git a/sdl_android_lib/src/com/smartdevicelink/Dispatcher/OutgoingProtocolMessageComparitor.java b/sdl_android_lib/src/com/smartdevicelink/Dispatcher/OutgoingProtocolMessageComparitor.java
deleted file mode 100644
index 2e3d45134..000000000
--- a/sdl_android_lib/src/com/smartdevicelink/Dispatcher/OutgoingProtocolMessageComparitor.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.smartdevicelink.Dispatcher;

-

-import java.util.Comparator;

-

-import com.smartdevicelink.protocol.ProtocolMessage;

-

-public class OutgoingProtocolMessageComparitor implements Comparator<ProtocolMessage> {

-

-	@Override

-	public int compare(ProtocolMessage arg0, ProtocolMessage arg1) {

-		// Always return 0, turning the priority queue into a FIFO queue. 

-		return 0;

-	}

-}

-

diff --git a/sdl_android_lib/src/com/smartdevicelink/Dispatcher/ProxyMessageDispatcher.java b/sdl_android_lib/src/com/smartdevicelink/Dispatcher/ProxyMessageDispatcher.java
index dc964fccd..8db6f51e7 100644
--- a/sdl_android_lib/src/com/smartdevicelink/Dispatcher/ProxyMessageDispatcher.java
+++ b/sdl_android_lib/src/com/smartdevicelink/Dispatcher/ProxyMessageDispatcher.java
@@ -1,21 +1,19 @@
 package com.smartdevicelink.Dispatcher;

 

-import java.util.Comparator;

-import java.util.concurrent.PriorityBlockingQueue;

+import java.util.concurrent.LinkedBlockingQueue;

 

 import com.smartdevicelink.util.DebugTool;

 

 public class ProxyMessageDispatcher<T> {

-	PriorityBlockingQueue<T> _queue = null;

+	LinkedBlockingQueue<T> _queue = null;

 	private Thread _messageDispatchingThread = null;

 	IDispatchingStrategy<T> _strategy = null;

 

 	// Boolean to track if disposed

 	private Boolean dispatcherDisposed = false;

 	

-	public ProxyMessageDispatcher(String THREAD_NAME, Comparator<T> messageComparator, 

-			IDispatchingStrategy<T> strategy) {

-		_queue = new PriorityBlockingQueue<T>(10, messageComparator);

+	public ProxyMessageDispatcher(String THREAD_NAME, IDispatchingStrategy<T> strategy) {

+		_queue = new LinkedBlockingQueue<T>();

 		

 		_strategy = strategy;

 		

diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java
index 421989c8e..bcfbe2919 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java
+++ b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java
@@ -36,9 +36,6 @@ import android.util.Log;
 import com.smartdevicelink.proxy.RPCRequestFactory;

 import com.smartdevicelink.proxy.rpc.PutFile;

 import com.smartdevicelink.Dispatcher.IDispatchingStrategy;

-import com.smartdevicelink.Dispatcher.IncomingProtocolMessageComparitor;

-import com.smartdevicelink.Dispatcher.InternalProxyMessageComparitor;

-import com.smartdevicelink.Dispatcher.OutgoingProtocolMessageComparitor;

 import com.smartdevicelink.Dispatcher.ProxyMessageDispatcher;

 import com.smartdevicelink.SdlConnection.ISdlConnectionListener;

 import com.smartdevicelink.SdlConnection.SdlConnection;

@@ -456,9 +453,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 				_internalProxyMessageDispatcher = null;

 			}

 			

-			_internalProxyMessageDispatcher = new ProxyMessageDispatcher<InternalProxyMessage>("INTERNAL_MESSAGE_DISPATCHER",

-					new InternalProxyMessageComparitor(),

-					new IDispatchingStrategy<InternalProxyMessage>() {

+			_internalProxyMessageDispatcher = new ProxyMessageDispatcher<InternalProxyMessage>("INTERNAL_MESSAGE_DISPATCHER", new IDispatchingStrategy<InternalProxyMessage>() {

 

 						@Override

 						public void dispatch(InternalProxyMessage message) {

@@ -485,9 +480,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 				_incomingProxyMessageDispatcher = null;

 			}

 			

-			_incomingProxyMessageDispatcher = new ProxyMessageDispatcher<ProtocolMessage>("INCOMING_MESSAGE_DISPATCHER",

-					new IncomingProtocolMessageComparitor(),

-					new IDispatchingStrategy<ProtocolMessage>() {

+			_incomingProxyMessageDispatcher = new ProxyMessageDispatcher<ProtocolMessage>("INCOMING_MESSAGE_DISPATCHER",new IDispatchingStrategy<ProtocolMessage>() {

 						@Override

 						public void dispatch(ProtocolMessage message) {

 							dispatchIncomingMessage((ProtocolMessage)message);

@@ -513,9 +506,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 				_outgoingProxyMessageDispatcher = null;

 			}

 			

-			_outgoingProxyMessageDispatcher = new ProxyMessageDispatcher<ProtocolMessage>("OUTGOING_MESSAGE_DISPATCHER",

-					new OutgoingProtocolMessageComparitor(),

-					new IDispatchingStrategy<ProtocolMessage>() {

+			_outgoingProxyMessageDispatcher = new ProxyMessageDispatcher<ProtocolMessage>("OUTGOING_MESSAGE_DISPATCHER",new IDispatchingStrategy<ProtocolMessage>() {

 						@Override

 						public void dispatch(ProtocolMessage message) {

 							dispatchOutgoingMessage((ProtocolMessage)message);