Changeset 1360

Timestamp:

05/23/11 12:47:49 (13 years ago)

Author:

twagoo

Message:

FactoryDBImpl:
-getOrCreateUser made synchronized
-renamed getCompRegForUser to getNEWCompRegForUser
-single member instance of public registry

File:

• ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryFactoryDbImpl.java (modified) (5 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryFactoryDbImpl.java

@@ -32 +32 @@
     @Autowired
     private UserDao userDao;
+    private ComponentRegistry publicComponentRegistry = null;
 
     @Override
     public List<ComponentRegistry> getAllUserRegistries() {
         // TODO: this probably could use some caching
-
         try {
             List<User> users = userDao.getAllUsers();
             List<ComponentRegistry> registries = new ArrayList<ComponentRegistry>();
             for (User user : users) {
-                ComponentRegistryDbImpl registry = componentRegistryBeanFactory.getNewComponentRegistry();
-                registry.setUserId(user.getId());
-                registries.add(registry);
+                registries.add(getNewComponentRegistryForUser(user.getId()));
             }
             return registries;
@@ -60 +58 @@
                 try {
                     User user = getOrCreateUser(principalName, credentials.getDisplayName());
-                    result = getComponentRegistryForUser(user.getId());
+                    result = getNewComponentRegistryForUser(user.getId());
                 } catch (DataAccessException ex) {
                     LOG.error("Could not retrieve or create user", ex);
@@ -81 +79 @@
             if (user != null) {
                 if (configuration.isAdminUser(adminPrincipal)) {
-                    result = getComponentRegistryForUser(user.getId());
+                    result = getNewComponentRegistryForUser(user.getId());
                 } else {
                     LOG.info(adminPrincipal.getName() + " not found in list of " + configuration.getAdminUsersArray().length);
@@ -96 +94 @@
     @Override
     public ComponentRegistry getPublicRegistry() {
-        return getComponentRegistryForUser(null);
+        if (publicComponentRegistry == null) {
+            publicComponentRegistry = getNewComponentRegistryForUser(null);
+        }
+        return publicComponentRegistry;
     }
 
-    private ComponentRegistry getComponentRegistryForUser(Number userId) {
+    private ComponentRegistry getNewComponentRegistryForUser(Number userId) {
         ComponentRegistryDbImpl componentRegistry = componentRegistryBeanFactory.getNewComponentRegistry();
         componentRegistry.setUserId(userId);
@@ -105 +106 @@
     }
 
-    private User getOrCreateUser(String principalName, String displayName) {
+    private synchronized User getOrCreateUser(String principalName, String displayName) {
         // Try getting it from db
         User user = userDao.getByPrincipalName(principalName);