Produced by Araxis Merge on 7/10/2017 1:01:45 PM Central 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.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | C:\AraxisMergeCompare\Pri_un\IV-ehmp_cif\ImagingVistaRealmClient\main\src\java\gov\va\med\imaging\tomcat\vistarealm | RealmErrorContext.java | Thu Jun 29 17:22:25 2017 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\IV-ehmp_cif\ImagingVistaRealmClient\main\src\java\gov\va\med\imaging\tomcat\vistarealm | RealmErrorContext.java | Thu Jul 6 15:03:49 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 212 |
| Changed | 2 | 4 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| 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 |
No regular expressions were active.
| 1 | /** | |
| 2 | * | |
| 3 | Package: MAG - Vis tA Imaging | |
| 4 | WARNING: Per VHA D irective 2 004-038, t his routin e should n ot be modi fied. | |
| 5 | Date Cre ated: May 19, 2011 | |
| 6 | Site Nam e: Washin gton OI Fi eld Office , Silver S pring, MD | |
| 7 | Developer:
|
|
| 8 | Descript ion: | |
| 9 | ||
| 10 | ;; +-------- ---------- ---------- ---------- ---------- ---------- ---------- + | |
| 11 | ;; Property of the US Government . | |
| 12 | ;; No permis sion to co py or redi stribute t his softwa re is give n. | |
| 13 | ;; Use of un released v ersions of this soft ware requi res the us er | |
| 14 | ;; to execu te a writt en test ag reement wi th the Vis tA Imaging | |
| 15 | ;; Developm ent Office of the De partment o f Veterans Affairs, | |
| 16 | ;; telephon e (301) 73 4-0100. | |
| 17 | ;; | |
| 18 | ;; The Food and Drug A dministrat ion classi fies this software a s | |
| 19 | ;; a Class I I medical device. A s such, it may not b e changed | |
| 20 | ;; in any wa y. Modifi cations to this soft ware may r esult in a n | |
| 21 | ;; adulterat ed medical device un der 21CFR8 20, the us e of which | |
| 22 | ;; is consid ered to be a violati on of US F ederal Sta tutes. | |
| 23 | ;; +-------- ---------- ---------- ---------- ---------- ---------- ---------- + | |
| 24 | ||
| 25 | */ | |
| 26 | package go v.va.med.i maging.tom cat.vistar ealm; | |
| 27 | ||
| 28 | import jav a.util.Has hMap; | |
| 29 | import jav a.util.Map ; | |
| 30 | ||
| 31 | /** | |
| 32 | * This is a thread local cont ext to hol d error me ssages whe n attempti ng to auth enticate w ith a Vist A realm. | |
| 33 | * | |
| 34 | * @author
|
|
| 35 | * | |
| 36 | */ | |
| 37 | public cla ss RealmEr rorContext | |
| 38 | { | |
| 39 | pu blic final static St ring realm ErrorConte xtExceptio nName = "e rrorContex tException Name"; | |
| 40 | pu blic final static St ring realm ErrorConte xtExceptio nMessage = "errorCon textExcept ionMessage "; | |
| 41 | pu blic final static St ring realm ErrorConte xtSkipVist aAuthentic ation = "e rrorContex tSkipVista Authentica tion"; | |
| 42 | ||
| 43 | ||
| 44 | pr ivate stat ic ThreadL ocal<Map<S tring, Str ing>> real mErrorCont ext = | |
| 45 | new ThreadLoca l<Map<Stri ng, String >>() | |
| 46 | { | |
| 47 | @Overr ide | |
| 48 | protec ted Map<St ring, Stri ng> initia lValue() | |
| 49 | { | |
| 50 | return n ew HashMap <String, S tring>(); | |
| 51 | } | |
| 52 | }; | |
| 53 | ||
| 54 | pr ivate stat ic ThreadL ocal<Map<S tring, Str ing>> getR ealmErrorC ontext() | |
| 55 | { | |
| 56 | retu rn realmEr rorContext ; | |
| 57 | } | |
| 58 | ||
| 59 | pu blic stati c Map<Stri ng, String > getRealm ErrorConte xtProperti es() | |
| 60 | { | |
| 61 | retu rn getReal mErrorCont ext().get( ); | |
| 62 | } | |
| 63 | ||
| 64 | pu blic stati c void uns etRealmErr orContext( ) | |
| 65 | { | |
| 66 | if(r ealmErrorC ontext != null) | |
| 67 | realmE rrorContex t.remove() ; | |
| 68 | } | |
| 69 | ||
| 70 | pu blic stati c void cle ar() | |
| 71 | { | |
| 72 | getR ealmErrorC ontextProp erties().c lear(); | |
| 73 | } | |
| 74 | ||
| 75 | pu blic stati c void set Property(S tring name , String v alue) | |
| 76 | { | |
| 77 | getR ealmErrorC ontextProp erties().p ut(name, v alue); | |
| 78 | } | |
| 79 | ||
| 80 | pu blic stati c String g etProperty (String na me) | |
| 81 | { | |
| 82 | retu rn getReal mErrorCont extPropert ies().get( name); | |
| 83 | } | |
| 84 | ||
| 85 | pu blic stati c void set ExceptionM essage(Thr owable t) | |
| 86 | { | |
| 87 | if(t != null) | |
| 88 | { | |
| 89 | setPro perty(real mErrorCont extExcepti onName, t. getClass() .getSimple Name()); | |
| 90 | setPro perty(real mErrorCont extExcepti onMessage, t.getMess age()); | |
| 91 | } | |
| 92 | } | |
| 93 | ||
| 94 | pu blic stati c void set SkipVistaA uthenticat ion(String skipVista Authentica tion) | |
| 95 | { | |
| 96 | if(s kipVistaAu thenticati on != null ) | |
| 97 | setPro perty(real mErrorCont extSkipVis taAuthenti cation, sk ipVistaAut henticatio n); | |
| 98 | } | |
| 99 | ||
| 100 | pu blic stati c boolean getSkipVis taAuthenti cation() | |
| 101 | { | |
| 102 | Stri ng skipVis taAuthenti cationStri ng = getRe almErrorCo ntextPrope rties().ge t(realmErr orContextS kipVistaAu thenticati on); | |
| 103 | if(s kipVistaAu thenticati onString = = null) | |
| 104 | return false; | |
| 105 | retu rn Boolean .parseBool ean(skipVi staAuthent icationStr ing); | |
| 106 | } | |
| 107 | ||
| 108 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.