hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[#1780] Use concurrent hashmap for stagemap

Browse Source
This commit is contained in:
SiboVG 2022-11-11 02:06:45 +01:00
parent 884e8edd59
commit 83d93776a1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/net/sf/openrocket/rocketcomponent/Rocket.java
View File

@ -1,6 +1,7 @@
package net.sf.openrocket.rocketcomponent; package net.sf.openrocket.rocketcomponent;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -62,7 +63,7 @@ public class Rocket extends ComponentAssembly {
// Flight configuration list // Flight configuration list
private FlightConfiguration selectedConfiguration; private FlightConfiguration selectedConfiguration;
private FlightConfigurableParameterSet<FlightConfiguration> configSet; private FlightConfigurableParameterSet<FlightConfiguration> configSet;
private HashMap<Integer, AxialStage> stageMap = new HashMap<>(); private ConcurrentHashMap<Integer, AxialStage> stageMap = new ConcurrentHashMap<>();
// Does the rocket have a perfect finish (a notable amount of laminar flow) // Does the rocket have a perfect finish (a notable amount of laminar flow)
private boolean perfectFinish = false; private boolean perfectFinish = false;
@ -371,7 +372,7 @@ public class Rocket extends ComponentAssembly {
final Rocket copyRocket = (Rocket) super.copyWithOriginalID(); final Rocket copyRocket = (Rocket) super.copyWithOriginalID();
// Rocket copy is cloned, so non-trivial members must be cloned as well: // Rocket copy is cloned, so non-trivial members must be cloned as well:
copyRocket.stageMap = new HashMap<>(); copyRocket.stageMap = new ConcurrentHashMap<>();
for( Map.Entry<Integer,AxialStage> entry : this.stageMap.entrySet()){ for( Map.Entry<Integer,AxialStage> entry : this.stageMap.entrySet()){
final AxialStage stage = (AxialStage)copyRocket.findComponent(entry.getValue().getID()); final AxialStage stage = (AxialStage)copyRocket.findComponent(entry.getValue().getID());
copyRocket.stageMap.put(entry.getKey(), stage); copyRocket.stageMap.put(entry.getKey(), stage);