1 files changed, 14 insertions, 5 deletions
diff --git a/src/com/isode/stroke/client/CoreClient.java b/src/com/isode/stroke/client/CoreClient.java
index 010a535..6cb0d5d 100644
--- a/src/com/isode/stroke/client/CoreClient.java
+++ b/src/com/isode/stroke/client/CoreClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015, Isode Limited, London, England.
+ * Copyright (c) 2010-2016, Isode Limited, London, England.
 * All rights reserved.
 */
 package com.isode.stroke.client;
@@ -347,11 +347,20 @@ public class CoreClient {
        }
        else {
            assert (connection_ == null);
-            connection_ = connection;
            assert (sessionStream_ == null);
-            sessionStream_ = new BasicSessionStream(StreamType.ClientStreamType, connection_, payloadParserFactories_, payloadSerializers_, networkFactories.getTLSContextFactory(), networkFactories.getTimerFactory(), options.tlsOptions);
+            
-            if (certificate_ != null && !certificate_.isNull()) {
+            if (certificate_ != null && certificate_.isNull()) {
+                // Certificate can not be read so do not initialise session
+                onDisconnected.emit(new ClientError(ClientError.Type.ClientCertificateLoadError));
+                return;
+            }
+            
+            connection_ = connection;
+            
+            sessionStream_ = 
+                    new BasicSessionStream(StreamType.ClientStreamType, connection_, payloadParserFactories_, payloadSerializers_, 
+                            networkFactories.getTLSContextFactory(), networkFactories.getTimerFactory(), options.tlsOptions);
+            if (certificate_ != null) {
                sessionStream_.setTLSCertificate(certificate_);
            }
            sessionStreamDataReadConnection_ = sessionStream_.onDataRead.connect(new Slot1<SafeByteArray>() {

diff --git a/src/com/isode/stroke/client/CoreClient.java b/src/com/isode/stroke/client/CoreClient.java index 010a535..6cb0d5d 100644 --- a/src/com/isode/stroke/client/CoreClient.java +++ b/src/com/isode/stroke/client/CoreClient.java
@@ -1,5 +1,5 @@
1	/*	1	/*
2	* Copyright (c) 2010-2015, Isode Limited, London, England.	2	* Copyright (c) 2010-2016, Isode Limited, London, England.
3	* All rights reserved.	3	* All rights reserved.
4	*/	4	*/
5	package com.isode.stroke.client;	5	package com.isode.stroke.client;
@@ -347,11 +347,20 @@ public class CoreClient {
347	}	347	}
348	else {	348	else {
349	assert (connection_ == null);	349	assert (connection_ == null);
350	connection_ = connection;
351
352	assert (sessionStream_ == null);	350	assert (sessionStream_ == null);
353	sessionStream_ = new BasicSessionStream(StreamType.ClientStreamType, connection_, payloadParserFactories_, payloadSerializers_, networkFactories.getTLSContextFactory(), networkFactories.getTimerFactory(), options.tlsOptions);	351
354	if (certificate_ != null && !certificate_.isNull()) {	352	if (certificate_ != null && certificate_.isNull()) {
		353	// Certificate can not be read so do not initialise session
		354	onDisconnected.emit(new ClientError(ClientError.Type.ClientCertificateLoadError));
		355	return;
		356	}
		357
		358	connection_ = connection;
		359
		360	sessionStream_ =
		361	new BasicSessionStream(StreamType.ClientStreamType, connection_, payloadParserFactories_, payloadSerializers_,
		362	networkFactories.getTLSContextFactory(), networkFactories.getTimerFactory(), options.tlsOptions);
		363	if (certificate_ != null) {
355	sessionStream_.setTLSCertificate(certificate_);	364	sessionStream_.setTLSCertificate(certificate_);
356	}	365	}
357	sessionStreamDataReadConnection_ = sessionStream_.onDataRead.connect(new Slot1<SafeByteArray>() {	366	sessionStreamDataReadConnection_ = sessionStream_.onDataRead.connect(new Slot1<SafeByteArray>() {