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

Fix concurrency issue in hashmap

This commit is contained in:
jamesagnew 2018-08-03 13:00:57 -04:00
parent 0556dfa7af
commit 6586fc438d
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/HashMapResourceProvider.java
View File

@ -9,9 +9,9 @@ package ca.uhn.fhir.rest.server.provider;
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -65,8 +65,8 @@ public class HashMapResourceProvider<T extends IBaseResource> implements IResour
private final Class<T> myResourceType; private final Class<T> myResourceType;
private final FhirContext myFhirContext; private final FhirContext myFhirContext;
private final String myResourceName; private final String myResourceName;
protected Map<String, TreeMap<Long, T>> myIdToVersionToResourceMap = new LinkedHashMap<>(); protected Map<String, TreeMap<Long, T>> myIdToVersionToResourceMap = Collections.synchronizedMap(new LinkedHashMap<>());
protected Map<String, LinkedList<T>> myIdToHistory = new LinkedHashMap<>(); protected Map<String, LinkedList<T>> myIdToHistory = Collections.synchronizedMap(new LinkedHashMap<>());
protected LinkedList<T> myTypeHistory = new LinkedList<>(); protected LinkedList<T> myTypeHistory = new LinkedList<>();
private long myNextId; private long myNextId;
private AtomicLong myDeleteCount = new AtomicLong(0); private AtomicLong myDeleteCount = new AtomicLong(0);
@ -188,9 +188,7 @@ public class HashMapResourceProvider<T extends IBaseResource> implements IResour
} }
private synchronized TreeMap<Long, T> getVersionToResource(String theIdPart) { private synchronized TreeMap<Long, T> getVersionToResource(String theIdPart) {
if (!myIdToVersionToResourceMap.containsKey(theIdPart)) { myIdToVersionToResourceMap.computeIfAbsent(theIdPart, t -> new TreeMap<>());
myIdToVersionToResourceMap.put(theIdPart, new TreeMap<>());
}
return myIdToVersionToResourceMap.get(theIdPart); return myIdToVersionToResourceMap.get(theIdPart);
} }
@ -333,9 +331,7 @@ public class HashMapResourceProvider<T extends IBaseResource> implements IResour
myTypeHistory.addFirst(theResource); myTypeHistory.addFirst(theResource);
// Store to ID history map // Store to ID history map
if (!myIdToHistory.containsKey(theIdPart)) { myIdToHistory.computeIfAbsent(theIdPart, t -> new LinkedList<>());
myIdToHistory.put(theIdPart, new LinkedList<>());
}
myIdToHistory.get(theIdPart).addFirst(theResource); myIdToHistory.get(theIdPart).addFirst(theResource);
// Return the newly assigned ID including the version ID // Return the newly assigned ID including the version ID