--- a/src/org/tn5250j/framework/transport/SSL/SSLImplementation.java	Tue Jun 03 12:10:21 2014 -0700
+++ b/src/org/tn5250j/framework/transport/SSL/SSLImplementation.java	Tue Jun 03 12:16:46 2014 -0700
@@ -57,9 +57,8 @@
  *
  */
 public class SSLImplementation implements SSLInterface, X509TrustManager {
-
+    private static final String TAG = "SSLImplementation";
 	SSLContext sslContext = null;
-
 	KeyStore userks = null;
 	private String userKsPath;
 	private char[] userksPassword = "changeit".toCharArray();
@@ -76,8 +75,6 @@
 
 	X509Certificate[] acceptedIssuers;
 
-	TN5250jLogger logger;
-
 	public SSLImplementation(TerminalBridge bridge, TerminalManager manager) {
         this.bridge  = bridge;
         this.manager = manager;
@@ -86,27 +83,27 @@
 
 	public void init(String sslType) {
 		try {
-			logger.debug("Initializing User KeyStore");
+			Log.d(TAG,"Initializing User KeyStore");
 			userKsPath = System.getProperty("user.home") + File.separator
 					+ GlobalConfigure.TN5250J_FOLDER + File.separator + "keystore";
 			File userKsFile = new File(userKsPath);
 			userks = KeyStore.getInstance(KeyStore.getDefaultType());
 			userks.load(userKsFile.exists() ? new FileInputStream(userKsFile)
 					: null, userksPassword);
-			logger.debug("Initializing User Key Manager Factory");
+			Log.d(TAG,"Initializing User Key Manager Factory");
 			userkmf = KeyManagerFactory.getInstance(KeyManagerFactory
 					.getDefaultAlgorithm());
 			userkmf.init(userks, userksPassword);
-			logger.debug("Initializing User Trust Manager Factory");
+			Log.d(TAG,"Initializing User Trust Manager Factory");
 			usertmf = TrustManagerFactory.getInstance(TrustManagerFactory
 					.getDefaultAlgorithm());
 			usertmf.init(userks);
 			userTrustManagers = usertmf.getTrustManagers();
-			logger.debug("Initializing SSL Context");
+			Log.d(TAG,"Initializing SSL Context");
 			sslContext = SSLContext.getInstance(sslType);
 			sslContext.init(userkmf.getKeyManagers(), new TrustManager[] {this}, null);
 		} catch (Exception ex) {
-			logger.error("Error initializing SSL [" + ex.getMessage() + "]");
+			Log.e(TAG,"Error initializing SSL [" + ex.getMessage() + "]");
 		}
 
 	}
@@ -120,7 +117,7 @@
 			socket = (SSLSocket) sslContext.getSocketFactory().createSocket(
 					destination, port);
 		} catch (Exception e) {
-			logger.error("Error creating ssl socket [" + e.getMessage() + "]");
+			Log.e(TAG,"Error creating ssl socket [" + e.getMessage() + "]");
 		}
 		return socket;
 	}
@@ -207,7 +204,7 @@
 					userks.store(new FileOutputStream(userKsPath),
 							userksPassword);
 				} catch (Exception e) {
-					logger.error("Error saving certificate [" + e.getMessage()
+					Log.e(TAG,"Error saving certificate [" + e.getMessage()
 							+ "]");
 					e.printStackTrace();
 				}