4338. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 6/9/2017 3:51:29 PM Eastern Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

4338.1 Files compared

#	Location	File	Last Modified
1			Fri Jun 9 19:51:29 2017 UTC
2	eHealth_Exch (eHealth Exchange Enhancements) Build 3 docs & code_May_2017.zip\VAP_CIF_CODE0502.zip\VAP_CIF_CODE0502\VAP_CIF_CODE0502\nvap-web\src\main\java\gov\va\nvap\web\user	UserHelper.java	Fri Apr 21 20:15:58 2017 UTC

4338.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	0	0
Changed	0	0
Inserted	1	27
Removed	0	0

4338.3 Comparison options

Whitespace
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail

4338.4 Active regular expressions

No regular expressions were active.

4338.5 Comparison detail

				1		package go v.va.nvap. web.user;
				2
				3		import jav ax.servlet .http.Http ServletReq uest;
				4		import org .apache.co mmons.logg ing.Log;
				5		import org .apache.co mmons.logg ing.LogFac tory;
				6
				7		/**
				8		*
				9		* @author Zack Pete rson
				10		*/
				11		public cla ss UserHel per {
				12
				13		privat e static f inal Log L OG = LogFa ctory.getL og(UserHel per.class) ;
				14		privat e static f inal Strin g VA_USERN AME = "adS amAccountN ame";
				15
				16		public static St ring getUs erName(Htt pServletRe quest requ est) {
				17		if (request != null) {
				18		if (requ est.getSes sion() != null && re quest.getS ession().g etAttribut e("user") != null) {
				19		retu rn ((User) request.ge tSession() .getAttrib ute("user" )).getName ();
				20		} else i f (request .getAttrib ute(VA_USE RNAME) != null) {
				21		retu rn (String )request.g etAttribut e(VA_USERN AME);
				22		}
				23		}
				24
				25		re turn "";
				26		}
				27		}