[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 dev1:/tmp/cvs-serv32529/miners/org/eclipse/rse/dstore/universal/miners

Modified Files:
      Tag: R3_2_maintenance
	UniversalProcessMiner.java 
Log Message:
[364633] [dstore][multithread] process miner getting wrong uid


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.6
retrieving revision 1.6.4.1
diff -C2 -d -r1.6 -r1.6.4.1
*** UniversalProcessMiner.java	20 May 2008 15:26:08 -0000	1.6
--- UniversalProcessMiner.java	23 Nov 2011 19:16:51 -0000	1.6.4.1
***************
*** 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
***************
*** 17,20 ****
--- 17,21 ----
   * David McKnight     (IBM)   [224906] [dstore] changes for getting properties and doing exit due to single-process capability
   * 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
   *******************************************************************************/
  
***************
*** 91,95 ****
  		DataElement subject = getCommandArgument(theCommand, 0);
  		
! 		//UniversalServerUtilities.logInfo(getMinerName(), name + ":" + subject);
  				
  		if (subject == null) {
--- 92,96 ----
  		DataElement subject = getCommandArgument(theCommand, 0);
  		
! 		UniversalServerUtilities.logInfo(getMinerName(), name + ":" + subject, _dataStore);
  				
  		if (subject == null) {
***************
*** 152,159 ****
  	protected DataElement handleQueryUserName(DataElement subject, DataElement status) {
  		if (_dataStore.getClient() != null){
! 			subject.setAttribute(DE.A_VALUE, _dataStore.getClient().getProperty("user.name")); //$NON-NLS-1$			
  		}
  		else {
! 			subject.setAttribute(DE.A_VALUE, System.getProperty("user.name")); //$NON-NLS-1$
  		}
  		
--- 153,162 ----
  	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); 
  		}