TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix IndexOutOfBoundsException caused by asynchronous init of MathRegistry

Browse Source
This commit is contained in:
serso 2017-07-26 10:16:59 +02:00
parent 3c03f3948d
commit 07b989f00e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jscl/src/main/java/org/solovyev/common/math/AbstractMathRegistry.java
View File

@ -170,7 +170,9 @@ public abstract class AbstractMathRegistry<T extends MathEntity> implements Math
public List<String> getNames() { public List<String> getNames() {
synchronized (this) { synchronized (this) {
if (!entityNames.isEmpty()) { if (!entityNames.isEmpty()) {
return entityNames; // if the registry is not initialized yet we expect entityNames to be updated on a
// background thread => return its copy
return !initialized ? new ArrayList<>(entityNames) : entityNames;
} }
for (T entity : entities) { for (T entity : entities) {
final String name = entity.getName(); final String name = entity.getName();
@ -178,7 +180,9 @@ public abstract class AbstractMathRegistry<T extends MathEntity> implements Math
entityNames.add(name); entityNames.add(name);
} }
} }
return entityNames; // if the registry is not initialized yet we expect entityNames to be updated on a
// background thread => return its copy
return !initialized ? new ArrayList<>(entityNames) : entityNames;
} }
} }