Refactor and fix TenantManage for repeated queries

[nemo.git] / nemo-impl / src / main / java / org / opendaylight / nemo / user / tenantmanager / AAA.java

diff --git a/nemo-impl/src/main/java/org/opendaylight/nemo/user/tenantmanager/AAA.java b/nemo-impl/src/main/java/org/opendaylight/nemo/user/tenantmanager/AAA.java
index 51e693e035fbef15188a3c56a21cc467491d01a8..3af90fcf2a8e95d7195aa816b4e7c9a661ccea9a 100644 (file)
--- a/nemo-impl/src/main/java/org/opendaylight/nemo/user/tenantmanager/AAA.java
+++ b/nemo-impl/src/main/java/org/opendaylight/nemo/user/tenantmanager/AAA.java
@@ -36,12 +36,11 @@ public class AAA {
 \r
     private String checkUser(UserId userId, UserName userName, UserPassword userPassword, UserRoleName userRoleName)\r
     {\r
-        tenantManage.fetchUsers();\r
         final Map<UserId, User> users = tenantManage.getUsers();\r
         String errorInfo = null;\r
-        final User user = users.get(userId);\r
+        final User user = (users != null) ? users.get(userId) : null;\r
 \r
-        if (users.containsKey(userId) && user != null) {\r
+        if (user != null) {\r
             if (!user.getUserName().equals(userName)) {\r
                 errorInfo = "The user name is not right.";\r
             } else if (!user.getUserPassword().equals(userPassword)) {\r
@@ -49,6 +48,7 @@ public class AAA {
             } else if (!user.getUserRole().equals(userRoleName)) {\r
                 errorInfo = "The role is not right.";\r
             }\r
+\r
         } else {\r
             errorInfo = "The user is not exist.";\r
         }\r