mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-19 06:55:23 +02:00
Code Issues Wiki Activity

Bug 359554 - Regression: Changing saved user ID while connecting disconnects existing subsystems

Browse source
This commit is contained in:
Martin Oberhuber 2011-09-30 14:48:39 +00:00
parent e0e7cb1964
commit 90f209540d
8 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
releng/org.eclipse.rse.updatesite/category.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<site> <site>
<feature url="features/org.eclipse.rse_3.3.1.qualifier.jar" id="org.eclipse.rse" version="3.3.1.qualifier"> <feature url="features/org.eclipse.rse_3.4.0.qualifier.jar" id="org.eclipse.rse" version="3.4.0.qualifier">
<category name="tm_34_main"/> <category name="tm_34_main"/>
</feature> </feature>
<feature url="features/org.eclipse.rse.sdk_3.3.1.qualifier.jar" id="org.eclipse.rse.sdk" version="3.3.1.qualifier"> <feature url="features/org.eclipse.rse.sdk_3.4.0.qualifier.jar" id="org.eclipse.rse.sdk" version="3.4.0.qualifier">
<category name="tm_34_main"/> <category name="tm_34_main"/>
</feature> </feature>
<feature url="features/org.eclipse.rse.useractions_1.1.300.qualifier.jar" id="org.eclipse.rse.useractions" version="1.1.300.qualifier"> <feature url="features/org.eclipse.rse.useractions_1.1.300.qualifier.jar" id="org.eclipse.rse.useractions" version="1.1.300.qualifier">

6
releng/org.eclipse.rse.updatesite/site.xml
View file

@ -746,7 +746,7 @@
</category-def> </category-def>
<!-- END_3_3 --> <!-- END_3_3 -->
<!-- BEGIN_3_4 --> <!-- BEGIN_3_4 -->
<feature url="features/org.eclipse.rse.core_3.3.1.qualifier.jar" id="org.eclipse.rse.core" version="3.3.1.qualifier"> <feature url="features/org.eclipse.rse.core_3.4.0.qualifier.jar" id="org.eclipse.rse.core" version="3.4.0.qualifier">
<category name="TM and RSE Uncategorized 3.4"/> <category name="TM and RSE Uncategorized 3.4"/>
</feature> </feature>
<feature url="features/org.eclipse.rse.dstore_3.3.1.qualifier.jar" id="org.eclipse.rse.dstore" version="3.3.1.qualifier"> <feature url="features/org.eclipse.rse.dstore_3.3.1.qualifier.jar" id="org.eclipse.rse.dstore" version="3.3.1.qualifier">
@ -758,10 +758,10 @@
<feature url="features/org.eclipse.rse.local_2.1.300.qualifier.jar" id="org.eclipse.rse.local" version="2.1.300.qualifier"> <feature url="features/org.eclipse.rse.local_2.1.300.qualifier.jar" id="org.eclipse.rse.local" version="2.1.300.qualifier">
<category name="TM and RSE Uncategorized 3.4"/> <category name="TM and RSE Uncategorized 3.4"/>
</feature> </feature>
<feature url="features/org.eclipse.rse_3.3.1.qualifier.jar" id="org.eclipse.rse" version="3.3.1.qualifier"> <feature url="features/org.eclipse.rse_3.4.0.qualifier.jar" id="org.eclipse.rse" version="3.4.0.qualifier">
<category name="TM and RSE Uncategorized 3.4"/> <category name="TM and RSE Uncategorized 3.4"/>
</feature> </feature>
<feature url="features/org.eclipse.rse.sdk_3.3.1.qualifier.jar" id="org.eclipse.rse.sdk" version="3.3.1.qualifier"> <feature url="features/org.eclipse.rse.sdk_3.4.0.qualifier.jar" id="org.eclipse.rse.sdk" version="3.4.0.qualifier">
<category name="TM and RSE Uncategorized 3.4"/> <category name="TM and RSE Uncategorized 3.4"/>
</feature> </feature>
<feature url="features/org.eclipse.rse.ssh_3.0.301.qualifier.jar" id="org.eclipse.rse.ssh" version="3.0.301.qualifier"> <feature url="features/org.eclipse.rse.ssh_3.0.301.qualifier.jar" id="org.eclipse.rse.ssh" version="3.0.301.qualifier">

8
releng/org.eclipse.tm.releng/maps/rse.map
View file

@ -1,12 +1,12 @@
!*************** PROJECT CONTRIBUTION ******************************************************** !*************** PROJECT CONTRIBUTION ********************************************************
!*** Project's plugins, features and fragments !*** Project's plugins, features and fragments
feature@org.eclipse.rse=R33x_v201109141647,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse-feature feature@org.eclipse.rse=v201109301448,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse-feature
feature@org.eclipse.rse.core=R33x_v201109141647,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature feature@org.eclipse.rse.core=v201109301448,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature
feature@org.eclipse.rse.dstore=R33x_v201109141647,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature feature@org.eclipse.rse.dstore=R33x_v201109141647,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature
feature@org.eclipse.rse.examples=v201103142315,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples-feature feature@org.eclipse.rse.examples=v201103142315,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples-feature
feature@org.eclipse.rse.ftp=R33x_v201109141647,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature feature@org.eclipse.rse.ftp=R33x_v201109141647,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature
feature@org.eclipse.rse.local=v201103142315,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature feature@org.eclipse.rse.local=v201103142315,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature
feature@org.eclipse.rse.sdk=R33x_v201109141647,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature feature@org.eclipse.rse.sdk=v201109301448,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature
feature@org.eclipse.rse.ssh=R33x_v201109141647,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.ssh-feature feature@org.eclipse.rse.ssh=R33x_v201109141647,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.ssh-feature
feature@org.eclipse.rse.telnet=v201106011538,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.telnet-feature feature@org.eclipse.rse.telnet=v201106011538,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.telnet-feature
feature@org.eclipse.rse.terminals=R33x_v201109141647,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.terminals-feature feature@org.eclipse.rse.terminals=R33x_v201109141647,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.terminals-feature
@ -22,7 +22,7 @@ plugin@org.eclipse.rse.connectorservice.dstore=v201103141607,:pserver:anonymous:
plugin@org.eclipse.rse.connectorservice.local=v201101042155,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.local plugin@org.eclipse.rse.connectorservice.local=v201101042155,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.local
plugin@org.eclipse.rse.connectorservice.ssh=v201101042155,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.ssh plugin@org.eclipse.rse.connectorservice.ssh=v201101042155,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.ssh
plugin@org.eclipse.rse.connectorservice.telnet=v201101042155,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.telnet plugin@org.eclipse.rse.connectorservice.telnet=v201101042155,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.telnet
plugin@org.eclipse.rse.core=R33x_v201109141647,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.core plugin@org.eclipse.rse.core=v201109301448,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.core
plugin@org.eclipse.rse.doc.isv=v201101042155,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.isv plugin@org.eclipse.rse.doc.isv=v201101042155,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.isv
plugin@org.eclipse.rse.doc.user=R33x_v201107181530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.user plugin@org.eclipse.rse.doc.user=R33x_v201107181530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.user
plugin@org.eclipse.rse.dstore.security=v201103141607,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.dstore.security plugin@org.eclipse.rse.dstore.security=v201103141607,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.dstore.security

2
rse/features/org.eclipse.rse-feature/feature.xml
View file

@ -12,7 +12,7 @@
<feature <feature
id="org.eclipse.rse" id="org.eclipse.rse"
label="%featureName" label="%featureName"
version="3.3.1.qualifier" version="3.4.0.qualifier"
provider-name="%providerName" provider-name="%providerName"
plugin="org.eclipse.rse" plugin="org.eclipse.rse"
image="eclipse_update_120.jpg"> image="eclipse_update_120.jpg">

2
rse/features/org.eclipse.rse.core-feature/feature.xml
View file

@ -12,7 +12,7 @@
<feature <feature
id="org.eclipse.rse.core" id="org.eclipse.rse.core"
label="%featureName" label="%featureName"
version="3.3.1.qualifier" version="3.4.0.qualifier"
provider-name="%providerName" provider-name="%providerName"
plugin="org.eclipse.rse.core"> plugin="org.eclipse.rse.core">

2
rse/features/org.eclipse.rse.sdk-feature/feature.xml
View file

@ -12,7 +12,7 @@
<feature <feature
id="org.eclipse.rse.sdk" id="org.eclipse.rse.sdk"
label="%featureName" label="%featureName"
version="3.3.1.qualifier" version="3.4.0.qualifier"
provider-name="%providerName" provider-name="%providerName"
image="eclipse_update_120.jpg"> image="eclipse_update_120.jpg">

2
rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rse.core;singleton:=true Bundle-SymbolicName: org.eclipse.rse.core;singleton:=true
Bundle-Version: 3.2.1.qualifier Bundle-Version: 3.2.100.qualifier
Bundle-Activator: org.eclipse.rse.core.RSECorePlugin Bundle-Activator: org.eclipse.rse.core.RSECorePlugin
Bundle-Localization: plugin Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime, Require-Bundle: org.eclipse.core.runtime,

14
rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRegistry.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006, 2009 IBM Corporation and others. All rights reserved. * Copyright (c) 2006, 2011 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -60,6 +60,7 @@
* David McKnight (IBM) - [254590] When disconnecting a subsystem with COLLAPSE option, subsystems of other connector services also get collapsed * David McKnight (IBM) - [254590] When disconnecting a subsystem with COLLAPSE option, subsystems of other connector services also get collapsed
* Martin Oberhuber (Wind River) - [245154][api] add getSubSystemConfigurationProxiesBySystemType() * Martin Oberhuber (Wind River) - [245154][api] add getSubSystemConfigurationProxiesBySystemType()
* Zhou Renjian (Kortide) - [282238] NPE when copying host and overwrite itself * Zhou Renjian (Kortide) - [282238] NPE when copying host and overwrite itself
* Martin Oberhuber (Wind River) - [359554] Avoid disconnect when changing default user id only
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.core.model; package org.eclipse.rse.internal.core.model;
@ -1965,12 +1966,17 @@ public class SystemRegistry implements ISystemRegistry
ISubSystem[] subsystems = getSubSystems(conn); // get list of related subsystems ISubSystem[] subsystems = getSubSystems(conn); // get list of related subsystems
for (int idx = 0; idx < subsystems.length; idx++) for (int idx = 0; idx < subsystems.length; idx++)
{ {
if (hostNameChanged || (subsystems[idx].getLocalUserId() == null)) //Need to clear caches if host name changed or user ID is inherited from default
if (hostNameChanged || (subsystems[idx].getConnectorService().supportsUserId() && subsystems[idx].getLocalUserId() == null))
{ {
try try
{ {
if (subsystems[idx].isConnected()) subsystems[idx].disconnect(); // MJB: added conditional for defect 45754 //MOB - Bug 359554: There is no reason for disconnecting subsystems just because a default user ID changed
if (defaultUserIdChanged) if (hostNameChanged && subsystems[idx].isConnected())
{
subsystems[idx].disconnect(); // MJB: added conditional for defect 45754
}
if (defaultUserIdChanged && !subsystems[idx].isConnected())
{ {
subsystems[idx].getConnectorService().clearCredentials(); subsystems[idx].getConnectorService().clearCredentials();
} }