[tm-cvs-commit] dmcknight org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/

[Eclipse CVS Genie <genie@xxxxxxxxxxx>]

Update of /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/ui/subsystems
In directory dev1:/tmp/cvs-serv18730/subsystems/org/eclipse/rse/ui/subsystems

Modified Files:
      Tag: R3_2_maintenance
	StandardCredentialsProvider.java 
Log Message:
[334839] File Content Conflict is not handled properly


Index: StandardCredentialsProvider.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/ui/subsystems/StandardCredentialsProvider.java,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -C2 -d -r1.24 -r1.24.2.1
*** StandardCredentialsProvider.java	14 Jan 2009 17:15:16 -0000	1.24
--- StandardCredentialsProvider.java	1 Mar 2011 15:38:15 -0000	1.24.2.1
***************
*** 1,4 ****
  /********************************************************************************
!  * Copyright (c) 2007, 2009 IBM Corporation and others. All rights reserved.
   * 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
--- 1,4 ----
  /********************************************************************************
!  * Copyright (c) 2007, 2011 IBM Corporation and others. All rights reserved.
   * 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
***************
*** 16,19 ****
--- 16,20 ----
   * Don Yantzi (IBM) - [233970] Handle messages provided by ICredentialsValidator
   * David Dykstal (IBM) - [261047] StandardCredentialsProvider does not cause a reacquire of a password when validation fails in a background thread 
+  * David McKnight   (IBM)        - [334839] File Content Conflict is not handled properly
   ********************************************************************************/
  package org.eclipse.rse.ui.subsystems;
***************
*** 80,83 ****
--- 81,87 ----
  		public void run() {
  			Shell shell = getShell();
+ 			if (shell == null){
+ 				shell = new Shell(); // need this for the case of being prompted during workbench shutdown
+ 			}
  			if (shell != null) {
  				ISystemPasswordPromptDialog dialog = getPasswordPromptDialog(shell);