change using syncronizedMap.

astroshim · astroshim · commit 26433f294510 · 2016-06-23T14:34:01.000+09:00
diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/Credentials.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/Credentials.java
@@ -24,6 +24,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.*;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -43,7 +44,7 @@ public Credentials(Boolean credentialsPersist, String credentialsPath) {
     if (credentialsPath != null) {
       credentialsFile = new File(credentialsPath);
     }
-    credentialsMap = new HashMap<>();
+    credentialsMap = Collections.synchronizedMap(new HashMap<String, UserCredentials>());
     if (credentialsPersist) {
       GsonBuilder builder = new GsonBuilder();
       builder.setPrettyPrinting();
@@ -61,17 +62,13 @@ public UserCredentials getUserCredentials(String username) {
   }
 
   public void putUserCredentials(String username, UserCredentials uc) throws IOException {
-    synchronized (credentialsMap) {
-      credentialsMap.put(username, uc);
-    }
+    credentialsMap.put(username, uc);
     saveCredentials();
   }
 
   public UserCredentials removeUserCredentials(String username) throws IOException {
     UserCredentials uc;
-    synchronized (credentialsMap) {
-      uc = credentialsMap.remove(username);
-    }
+    uc = credentialsMap.remove(username);
     saveCredentials();
     return uc;
   }
@@ -124,11 +121,9 @@ private void loadFromFile() {
   private void saveToFile() throws IOException {
     String jsonString;
 
-    synchronized (credentialsMap) {
-      CredentialsInfoSaving info = new CredentialsInfoSaving();
-      info.credentialsMap = credentialsMap;
-      jsonString = gson.toJson(info);
-    }
+    CredentialsInfoSaving info = new CredentialsInfoSaving();
+    info.credentialsMap = credentialsMap;
+    jsonString = gson.toJson(info);
 
     try {
       if (!credentialsFile.exists()) {
diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/UserCredentials.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/UserCredentials.java
@@ -17,6 +17,7 @@
 
 package org.apache.zeppelin.user;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -27,29 +28,23 @@ public class UserCredentials {
   private Map<String, UsernamePassword> userCredentials;
 
   public UserCredentials() {
-    this.userCredentials = new HashMap<>();
+    userCredentials = Collections.synchronizedMap(new HashMap<String, UsernamePassword>());
   }
 
   public UsernamePassword getUsernamePassword(String entity) {
     return userCredentials.get(entity);
   }
 
   public void putUsernamePassword(String entity, UsernamePassword up) {
-    synchronized (userCredentials) {
-      userCredentials.put(entity, up);
-    }
+    userCredentials.put(entity, up);
   }
 
   public void removeUsernamePassword(String entity) {
-    synchronized (userCredentials) {
-      userCredentials.remove(entity);
-    }
+    userCredentials.remove(entity);
   }
 
   public boolean existUsernamePassword(String entity) {
-    synchronized (userCredentials) {
-      return userCredentials.containsKey(entity);
-    }
+    return userCredentials.containsKey(entity);
   }
 
   @Override
