From 26cdbdce9886315f9220342db21fe2cebb0bd449 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Mon, 18 Feb 2008 18:40:57 +0000 Subject: [PATCH] [219260][dstore][regression] Cannot connect to dstore daemon --- releng/org.eclipse.rse.build/maps/rse.map | 2 +- releng/org.eclipse.tm.releng/maps/rse.map | 2 +- .../src/org/eclipse/dstore/core/client/ClientConnection.java | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/releng/org.eclipse.rse.build/maps/rse.map b/releng/org.eclipse.rse.build/maps/rse.map index 17f42d73d9f..f6cc6c49d4f 100644 --- a/releng/org.eclipse.rse.build/maps/rse.map +++ b/releng/org.eclipse.rse.build/maps/rse.map @@ -11,7 +11,7 @@ feature@org.eclipse.rse.sdk=v20080212,:pserver:anonymous:none@dev.eclipse.org:/c feature@org.eclipse.rse.ssh=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ssh-feature feature@org.eclipse.rse.telnet=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.telnet-feature feature@org.eclipse.rse.tests=v20080214,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests-feature -plugin@org.eclipse.dstore.core=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core +plugin@org.eclipse.dstore.core=v20080217,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core plugin@org.eclipse.dstore.doc.isv=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.dstore.doc.isv plugin@org.eclipse.dstore.extra=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.extra plugin@org.eclipse.rse=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse diff --git a/releng/org.eclipse.tm.releng/maps/rse.map b/releng/org.eclipse.tm.releng/maps/rse.map index 17f42d73d9f..f6cc6c49d4f 100644 --- a/releng/org.eclipse.tm.releng/maps/rse.map +++ b/releng/org.eclipse.tm.releng/maps/rse.map @@ -11,7 +11,7 @@ feature@org.eclipse.rse.sdk=v20080212,:pserver:anonymous:none@dev.eclipse.org:/c feature@org.eclipse.rse.ssh=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ssh-feature feature@org.eclipse.rse.telnet=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.telnet-feature feature@org.eclipse.rse.tests=v20080214,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests-feature -plugin@org.eclipse.dstore.core=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core +plugin@org.eclipse.dstore.core=v20080217,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core plugin@org.eclipse.dstore.doc.isv=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.dstore.doc.isv plugin@org.eclipse.dstore.extra=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.extra plugin@org.eclipse.rse=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java index 7458845025d..ffeefd0c35e 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java +++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java @@ -14,6 +14,7 @@ * Contributors: * David McKnight (IBM) - [205986] daemon handshake needs a timeout * David McKnight (IBM) - [218685] [dstore] Unable to connect when using SSL. + * Martin Oberhuber (Wind River) - [219260][dstore][regression] Cannot connect to dstore daemon *******************************************************************************/ package org.eclipse.dstore.core.client; @@ -640,6 +641,10 @@ public class ClientConnection public ConnectionStatus launchServer(String user, String password, int daemonPort, int timeout) { + if (timeout<=0) { + //bug 219260: default timeout 10 sec if not specified + timeout = 10000; + } ConnectionStatus result = connectDaemon(daemonPort, timeout); if (!result.isConnected()) { return result;