mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-10 12:03:16 +02:00
Code Issues Wiki Activity

[218685] [api][breaking][dstore] Unable to connect when using SSL.

Browse source
This commit is contained in:
David McKnight 2008-02-21 19:33:06 +00:00
parent 58c099fe34
commit da1589648a
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java
View file

@ -23,6 +23,7 @@
* David McKnight (IBM) - [196624] dstore miner IDs should be String constants rather than dynamic lookup
* David McKnight (IBM) - [216596] dstore preferences (timeout, and others)
* David McKnight (IBM) - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
* David McKnight (IBM) - [218685] [api][breaking][dstore] Unable to connect when using SSL.
*******************************************************************************/
package org.eclipse.rse.connectorservice.dstore;
@ -648,7 +649,7 @@ public class DStoreConnectorService extends StandardConnectorService implements
boolean usedSSL = true;
setSSLProperties(true);
launchStatus = launchServer(clientConnection, info, daemonPort, monitor);
launchStatus = launchServer(clientConnection, info, daemonPort, monitor, timeout);
if (!launchStatus.isConnected() && !clientConnection.isKnownStatus(launchStatus.getMessage()))
{
Throwable conE = launchStatus.getException();
@ -677,7 +678,7 @@ public class DStoreConnectorService extends StandardConnectorService implements
if (setSSLProperties(false))
{
usedSSL = false;
launchStatus = launchServer(clientConnection, info, daemonPort, monitor);
launchStatus = launchServer(clientConnection, info, daemonPort, monitor, timeout);
}
}

3
rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreConstants.java
View file

@ -14,6 +14,7 @@
* Contributors:
* {Name} (company) - description of contribution.
* David McKnight (IBM) - [216596] dstore preferences (timeout, and others)
* David McKnight (IBM) - [218685] [api][breaking][dstore] Unable to connect when using SSL.
*******************************************************************************/
package org.eclipse.rse.connectorservice.dstore;
@ -61,7 +62,7 @@ public interface IUniversalDStoreConstants
// Socket timeout preference
public static final String RESID_PREF_SOCKET_TIMEOUT = RESID_PREF_PREFIX + "sockettimeout"; //$NON-NLS-1$
public static final int DEFAULT_PREF_SOCKET_TIMEOUT = 300000;
public static final int DEFAULT_PREF_SOCKET_TIMEOUT = 100000;
public static final String RESID_PREF_DO_KEEPALIVE = RESID_PREF_PREFIX + "dokeepalive"; //$NON-NLS-1$
public static final boolean DEFAULT_PREF_DO_KEEPALIVE = true;