Merge pull request #520 from smartdevicelink/bugfix/issue_465

Bugfix/issue 465

2 files changed, 12 insertions, 3 deletions

diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java
index 9f0822a73..901a756a3 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java
@@ -6,6 +6,8 @@ import com.smartdevicelink.transport.enums.TransportType;
 
 import android.test.AndroidTestCase;
 
+import junit.framework.Assert;
+
 public class MultiplexTransportTest extends AndroidTestCase {
 
 	private static final int TIMEOUT = 2000;
@@ -69,8 +71,14 @@ public class MultiplexTransportTest extends AndroidTestCase {
 		
 		trans = new MultiplexTransport(config,transportListener);
 		assertTrue(trans.brokerThread.isAlive());
-		
-		
-		
+
+		// Send a null config object in the constructor and expect an IllegalArgumentException
+		try {
+			trans = new MultiplexTransport(null, transportListener);
+		} catch (IllegalArgumentException e) {
+			assertEquals("Null transportConfig in MultiplexTransport constructor", e.getMessage());
+		} catch (NullPointerException e) {
+			Assert.fail("NPE in MultiplexTransport constructor");
+		}
 	}
 }
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransport.java b/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransport.java
index ecb8281cc..c7cb0e59e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransport.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransport.java
@@ -24,6 +24,7 @@ public class MultiplexTransport extends SdlTransport{
 		super(transportListener);
 		if(transportConfig == null){
 			this.handleTransportError("Transport config was null", null);
+			throw new IllegalArgumentException("Null transportConfig in MultiplexTransport constructor");
 		}
 		this.transportConfig = transportConfig;
 		brokerThread = new TransportBrokerThread(transportConfig.context, transportConfig.appId, transportConfig.service);