vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-26 14:02:06 +01:00
Code Issues Releases Wiki Activity

Callback handler was not getting set properly

Browse source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11018 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Jay Kline 2009-05-27 16:51:39 +00:00 committed by jay
parent fdca9b339d
commit 0014cff963
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/org/jivesoftware/smack/XMPPConnection.java
View file

@ -226,7 +226,7 @@ public class XMPPConnection {
config.setSASLAuthenticationEnabled(true); config.setSASLAuthenticationEnabled(true);
config.setDebuggerEnabled(DEBUG_ENABLED); config.setDebuggerEnabled(DEBUG_ENABLED);
this.configuration = config; this.configuration = config;
this.callbackHandler = null; this.callbackHandler = config.getCallbackHandler();
} }
/** /**
@ -240,7 +240,7 @@ public class XMPPConnection {
*/ */
public XMPPConnection(ConnectionConfiguration config) { public XMPPConnection(ConnectionConfiguration config) {
this.configuration = config; this.configuration = config;
this.callbackHandler = null; this.callbackHandler = config.getCallbackHandler();
} }
/** /**
@ -1219,9 +1219,9 @@ public class XMPPConnection {
else { else {
ks = KeyStore.getInstance(configuration.getKeystoreType()); ks = KeyStore.getInstance(configuration.getKeystoreType());
try { try {
ks.load(new FileInputStream(configuration.getKeystorePath()), pcb.getPassword());
pcb = new PasswordCallback("Keystore Password: ",false); pcb = new PasswordCallback("Keystore Password: ",false);
callbackHandler.handle(new Callback[]{pcb}); callbackHandler.handle(new Callback[]{pcb});
ks.load(new FileInputStream(configuration.getKeystorePath()), pcb.getPassword());
} }
catch(Exception e) { catch(Exception e) {
ks = null; ks = null;