thread-safe setAttribute

jaeopt · jaeopt · commit a93fc23f2f82 · 2020-10-15T11:24:03.000-07:00
diff --git a/core-api/src/main/java/com/optimizely/ab/OptimizelyUserContext.java b/core-api/src/main/java/com/optimizely/ab/OptimizelyUserContext.java
@@ -29,6 +29,7 @@
 
 import javax.annotation.Nonnull;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class OptimizelyUserContext {
     @Nonnull
@@ -47,7 +48,7 @@ public OptimizelyUserContext(@Nonnull Optimizely optimizely,
                                  @Nonnull Map<String, ?> attributes) {
         this.optimizely = optimizely;
         this.userId = userId;
-        this.attributes = new HashMap<>(attributes);
+        this.attributes = new ConcurrentHashMap<>(attributes);
     }
 
     public OptimizelyUserContext(@Nonnull Optimizely optimizely, @Nonnull String userId) {
@@ -59,7 +60,7 @@ public String getUserId() {
     }
 
     public Map<String, Object> getAttributes() {
-        return attributes;
+        return new HashMap<String, Object>(attributes);
     }
 
     public Optimizely getOptimizely() {

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`
`30`	`30`	`import javax.annotation.Nonnull;`
`31`	`31`	`import java.util.*;`
	`32`	`+import java.util.concurrent.ConcurrentHashMap;`
`32`	`33`
`33`	`34`	`public class OptimizelyUserContext {`
`34`	`35`	`@Nonnull`
`@@ -47,7 +48,7 @@ public OptimizelyUserContext(@Nonnull Optimizely optimizely,`
`47`	`48`	`@Nonnull Map<String, ?> attributes) {`
`48`	`49`	`this.optimizely = optimizely;`
`49`	`50`	`this.userId = userId;`
`50`		`- this.attributes = new HashMap<>(attributes);`
	`51`	`+ this.attributes = new ConcurrentHashMap<>(attributes);`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`public OptimizelyUserContext(@Nonnull Optimizely optimizely, @Nonnull String userId) {`
`@@ -59,7 +60,7 @@ public String getUserId() {`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`public Map<String, Object> getAttributes() {`
`62`		`- return attributes;`
	`63`	`+ return new HashMap<String, Object>(attributes);`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`public Optimizely getOptimizely() {`