From 13a5c97365cc95df11adab154c4c633d3fb61812 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Fri, 31 Aug 2012 15:28:57 +0000 Subject: [PATCH] [388506] [dstore] [multithread] RSEC1001error window after the expired password has been changed --- .../connectorservice/dstore/DStoreConnectorService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java index 09f185fdb11..c28e2b2ec25 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java @@ -43,6 +43,7 @@ * David McKnight (IBM) - [284950] [dstore] Error binding socket on relaunch * David McKnight (IBM) - [283613] [dstore] Create a Constants File for all System Properties we support * David McKnight (IBM) - [384301] (DSTORE)Cached password revokes the user ID + * David McKnight (IBM) - [388506] [dstore] [multithread] RSEC1001error window after the expired password has been changed *******************************************************************************/ package org.eclipse.rse.connectorservice.dstore; @@ -719,8 +720,12 @@ public class DStoreConnectorService extends StandardConnectorService implements } if (newCredentials != null){ info = newCredentials; + if (clientConnection != null){ + clientConnection.setPort(Integer.toString(getPort())); //reset port to default + } } - if (launchMsg != null && launchMsg.equals(IDataStoreConstants.ATTEMPT_RECONNECT)){ + // need to reconnect if there are new credentials + if (newCredentials != null || (launchMsg != null && launchMsg.equals(IDataStoreConstants.ATTEMPT_RECONNECT))){ return connectWithDaemon(info, serverLauncher, alertedNONSSL, monitor); } }