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,11 +107,10 @@ public class IRCSession extends TransportSession { ...@@ -107,11 +107,10 @@ public class IRCSession extends TransportSession {
* Logs the session out of IRC. * Logs the session out of IRC.
*/ */
public void logOut() { public void logOut() {
if (isLoggedIn()) { ircListener.setSilenced(true);
ircListener.setSilenced(true); conn.doQuit();
conn.doQuit(); cleanUp();
sessionDisconnectedNoReconnect(); sessionDisconnectedNoReconnect();
}
} }
public void cleanUp() { public void cleanUp() {
......
...@@ -114,12 +114,8 @@ public class MSNSession extends TransportSession { ...@@ -114,12 +114,8 @@ public class MSNSession extends TransportSession {
* Log out of MSN. * Log out of MSN.
*/ */
public void logOut() { public void logOut() {
Log.debug("Logging out of MSN"); cleanUp();
if (isLoggedIn()) { sessionDisconnectedNoReconnect();
Log.debug("No really.");
cleanUp();
sessionDisconnectedNoReconnect();
}
} }
public void cleanUp() { public void cleanUp() {
......
...@@ -105,10 +105,8 @@ public class OSCARSession extends TransportSession { ...@@ -105,10 +105,8 @@ public class OSCARSession extends TransportSession {
} }
public synchronized void logOut() { public synchronized void logOut() {
if (isLoggedIn()) { cleanUp();
cleanUp(); sessionDisconnectedNoReconnect();
sessionDisconnectedNoReconnect();
}
} }
public synchronized void cleanUp() { public synchronized void cleanUp() {
......
...@@ -105,10 +105,8 @@ public class XMPPSession extends TransportSession { ...@@ -105,10 +105,8 @@ public class XMPPSession extends TransportSession {
} }
public void logOut() { public void logOut() {
if (isLoggedIn()) { cleanUp();
cleanUp(); sessionDisconnectedNoReconnect();
sessionDisconnectedNoReconnect();
}
} }
public void cleanUp() { public void cleanUp() {
......
...@@ -159,10 +159,8 @@ public class YahooSession extends TransportSession { ...@@ -159,10 +159,8 @@ public class YahooSession extends TransportSession {
* Log out of Yahoo. * Log out of Yahoo.
*/ */
public void logOut() { public void logOut() {
if (isLoggedIn()) { cleanUp();
cleanUp(); sessionDisconnectedNoReconnect();
sessionDisconnectedNoReconnect();
}
} }
public void cleanUp() { public void cleanUp() {
......
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