Commit cec0fc15 authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger

[GATE-23] Fixed bug with inability to log out.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@8210 b35dd754-fafc-0310-a699-88a17e54d16e
parent 87749f06
......@@ -107,12 +107,11 @@ public class IRCSession extends TransportSession {
* Logs the session out of IRC.
*/
public void logOut() {
if (isLoggedIn()) {
ircListener.setSilenced(true);
conn.doQuit();
cleanUp();
sessionDisconnectedNoReconnect();
}
}
public void cleanUp() {
ircListener.getTimer().cancel();
......
......@@ -114,13 +114,9 @@ public class MSNSession extends TransportSession {
* Log out of MSN.
*/
public void logOut() {
Log.debug("Logging out of MSN");
if (isLoggedIn()) {
Log.debug("No really.");
cleanUp();
sessionDisconnectedNoReconnect();
}
}
public void cleanUp() {
msnMessenger.logout();
......
......@@ -105,11 +105,9 @@ public class OSCARSession extends TransportSession {
}
public synchronized void logOut() {
if (isLoggedIn()) {
cleanUp();
sessionDisconnectedNoReconnect();
}
}
public synchronized void cleanUp() {
if (loginConn != null) {
......
......@@ -105,11 +105,9 @@ public class XMPPSession extends TransportSession {
}
public void logOut() {
if (isLoggedIn()) {
cleanUp();
sessionDisconnectedNoReconnect();
}
}
public void cleanUp() {
conn.removeConnectionListener(listener);
......
......@@ -159,11 +159,9 @@ public class YahooSession extends TransportSession {
* Log out of Yahoo.
*/
public void logOut() {
if (isLoggedIn()) {
cleanUp();
sessionDisconnectedNoReconnect();
}
}
public void cleanUp() {
try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment