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

[Eclipse CVS Genie <genie@xxxxxxxxxxx>]

Update of /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells
In directory dev2:/tmp/cvs-serv15518/src/org/eclipse/rse/internal/services/dstore/shells

Modified Files:
	DStoreShellService.java 
Log Message:
[356658] [dstore] getHostEnvironment returns an empty array immediately after connecting


Index: DStoreShellService.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellService.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DStoreShellService.java	22 Aug 2008 16:34:45 -0000	1.12
--- DStoreShellService.java	6 Oct 2011 18:59:01 -0000	1.13
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2006, 2008 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
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2006, 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
***************
*** 20,23 ****
--- 20,24 ----
   * Martin Oberhuber (Wind River) - [226301][api] IShellService should throw SystemMessageException on error
   * David McKnight   (IBM)        - [244898] [dstore] IRemoteCmdSubSystem.getHostEnvironmentVariables() call does not always work
+  * David McKnight   (IBM)        - [356658] [dstore] getHostEnvironment returns an empty array immediately after connecting
   *******************************************************************************/
  
***************
*** 106,109 ****
--- 107,114 ----
  		if (_envVars == null || _envVars.length == 0)
  		{
+ 			if (!isInitialized()){
+ 				waitForInitialize(null);
+ 			}
+ 			
  			List envVars = new ArrayList();
  			DataStore ds = getDataStore();