honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into im_20201015_loinc_versioned_resourceids

This commit is contained in:
ianmarshall 2020-10-16 16:48:32 -04:00
parent 6e0754da98 a25aa37e6a
commit 76416998ce
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BaseDateTimeDt.java
View File

@ -586,8 +586,7 @@ public abstract class BaseDateTimeDt extends BasePrimitive<Date> {
} }
private TimeZone getTimeZone(String offset) { private TimeZone getTimeZone(String offset) {
return timezoneCache.computeIfAbsent(offset, (offsetLocal) -> return timezoneCache.computeIfAbsent(offset, TimeZone::getTimeZone);
TimeZone.getTimeZone("GMT" + offsetLocal));
} }
public BaseDateTimeDt setTimeZone(TimeZone theTimeZone) { public BaseDateTimeDt setTimeZone(TimeZone theTimeZone) {