[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/miners/org/eclipse/rse/dstore/universal/miners
In directory dev2:/tmp/cvs-serv22000/miners/org/eclipse/rse/dstore/universal/miners

Modified Files:
	UniversalProcessMiner.java 
Log Message:
[385214] [dstore][processes] user id query coming back blank


Index: UniversalProcessMiner.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalProcessMiner.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** UniversalProcessMiner.java	23 Nov 2011 17:57:21 -0000	1.7
--- UniversalProcessMiner.java	16 Jul 2012 20:40:51 -0000	1.8
***************
*** 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
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2006, 2012 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
***************
*** 18,21 ****
--- 18,22 ----
   * David McKnight  (IBM)  - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
   * David McKnight  (IBM)  - [364633] [dstore][multithread] process miner getting wrong uid
+  * David McKnight  (IBM)  - [385214] [dstore][processes] user id query coming back blank
   *******************************************************************************/
  
***************
*** 152,163 ****
  	 */
  	protected DataElement handleQueryUserName(DataElement subject, DataElement status) {
  		if (_dataStore.getClient() != null){
! 			String userName = _dataStore.getClient().getProperty("client.username"); //$NON-NLS-1$
! 			subject.setAttribute(DE.A_VALUE, userName); 		
  		}
! 		else {
! 			String userName = System.getProperty("user.name"); //$NON-NLS-1$
! 			subject.setAttribute(DE.A_VALUE, userName); 
  		}
  		
  		_dataStore.refresh(subject);
--- 153,164 ----
  	 */
  	protected DataElement handleQueryUserName(DataElement subject, DataElement status) {
+ 		String userName = null;
  		if (_dataStore.getClient() != null){
! 			userName = _dataStore.getClient().getProperty("client.username"); //$NON-NLS-1$		
  		}
! 		if (userName == null){
! 			userName = System.getProperty("user.name"); //$NON-NLS-1$			
  		}
+ 		subject.setAttribute(DE.A_VALUE, userName); 
  		
  		_dataStore.refresh(subject);