mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-03 15:15:25 +02:00
Code Issues Wiki Activity

Try to avoid exceptions with Telnet disconnect

Browse source
This commit is contained in:
Martin Oberhuber 2007-05-11 13:30:48 +00:00
parent ca4b641ba5
commit 7e9da45590
2 changed files with 69 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
rse/plugins/org.eclipse.rse.connectorservice.telnet/src/org/eclipse/rse/internal/connectorservice/telnet/TelnetConnectorService.java
View file

@ -154,8 +154,12 @@ public class TelnetConnectorService extends StandardConnectorService implements
private synchronized void sessionDisconnect() {
Activator.trace("TelnetConnectorService.sessionDisconnect"); //$NON-NLS-1$
try {
if (fTelnetClient!=null && fTelnetClient.isConnected())
fTelnetClient.disconnect();
if (fTelnetClient!=null) {
synchronized(fTelnetClient) {
if (fTelnetClient.isConnected())
fTelnetClient.disconnect();
}
}
} catch(Exception e) {
//Avoid NPE on disconnect shown in UI
//This is a non-critical exception so print only in debug mode
@ -438,9 +442,11 @@ public class TelnetConnectorService extends StandardConnectorService implements
}
public boolean isConnected() {
boolean connected;
synchronized(this) {
connected = fTelnetClient.isConnected();
boolean connected = false;
if (fTelnetClient!=null) {
synchronized(fTelnetClient) {
connected = fTelnetClient.isConnected();
}
}
if (!connected && fSessionLostHandler!=null) {
Activator.trace("TelnetConnectorService.isConnected: false -> sessionLost"); //$NON-NLS-1$
@ -450,11 +456,59 @@ public class TelnetConnectorService extends StandardConnectorService implements
}
/**
* @return false
* Test if this connector service requires a password.
* Telnet connector service returns false since a password is
* not necessarily required, i.e. the corresponding
* password field may be empty.
* @see org.eclipse.rse.core.subsystems.AbstractConnectorService#requiresPassword()
* @return false
*/
public boolean requiresPassword() {
return false;
}
/**
* Test if this connector service requires a user id.
* Telnet connector service returns false since a user id
* is not necessarily required, i.e. the corresponding
* user id field may be empty.
* @see org.eclipse.rse.core.subsystems.AbstractConnectorService#requiresPassword()
* @return false
*/
public boolean requiresUserId() {
return false;
}
/**
* Test if this connector service requires logging in.
* @return false if the Property {@link #PROPERTY_LOGIN_REQUIRED}
* is set and false. Returns true otherwise.
*/
protected boolean supportsLogin() {
boolean result = true;
if (telnetPropertySet!=null) {
String login_required = telnetPropertySet.getPropertyValue(PROPERTY_LOGIN_REQUIRED);
if (login_required!=null && login_required.equalsIgnoreCase("false")) { //$NON-NLS-1$
result = false;
}
}
return result;
}
/*
* (non-Javadoc)
* @see org.eclipse.rse.ui.subsystems.StandardConnectorService#supportsPassword()
*/
public boolean supportsPassword() {
return supportsLogin();
}
/*
* (non-Javadoc)
* @see org.eclipse.rse.ui.subsystems.StandardConnectorService#supportsUserId()
*/
public boolean supportsUserId() {
return supportsLogin();
}
}

10
rse/plugins/org.eclipse.rse.services.telnet/src/org/eclipse/rse/internal/services/telnet/shell/TelnetHostShell.java
View file

@ -83,7 +83,15 @@ public class TelnetHostShell extends AbstractHostShell implements IHostShell {
public void exit() {
fShellWriter.stopThread();
try {
fSessionProvider.getTelnetClient().disconnect();
//TODO disconnect should better be done via the ConnectorService!!
//Because like we do it here, the connector service is not notified!
TelnetClient client = fSessionProvider.getTelnetClient();
if (client!=null) {
synchronized(client) {
if (client.isConnected())
client.disconnect();
}
}
} catch (IOException e) {
}