directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject [3/8] git commit: o Used locks instead of syncrhonization o Make is really thread safe, by protecting the global pool access and updates, for all operations o Separated the getOrgSet() method into 2 methods, as we already test the type before calling thi
Date Fri, 31 Oct 2014 18:18:30 GMT
o Used locks instead of syncrhonization
o Make is really thread safe, by protecting the global pool access and
updates, for all operations
o Separated the getOrgSet() method into 2 methods, as we already test
the type before calling this method


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/40f07664
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/40f07664
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/40f07664

Branch: refs/heads/master
Commit: 40f0766442a25009293c698357093eff1ebf6353
Parents: cb03e33
Author: Emmanuel L├ęcharny <elecharny@symas.com>
Authored: Fri Oct 31 16:34:28 2014 +0100
Committer: Emmanuel L├ęcharny <elecharny@symas.com>
Committed: Fri Oct 31 16:34:28 2014 +0100

----------------------------------------------------------------------
 .../directory/fortress/core/rbac/OrgUnitP.java  | 155 +++++++++++++++----
 1 file changed, 126 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/40f07664/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitP.java b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitP.java
index da019f3..3d2aa36 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitP.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitP.java
@@ -22,10 +22,11 @@ package org.apache.directory.fortress.core.rbac;
 
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.GlobalIds;
 import org.apache.directory.fortress.core.SecurityException;
@@ -62,8 +63,8 @@ public final class OrgUnitP
     private static final Logger LOG = LoggerFactory.getLogger( CLS_NM );
 
     // these fields are used to synchronize access to the above static pools:
-    private static final Object userPoolSynchLock = new Object();
-    private static final Object permPoolSynchLock = new Object();
+    private static final Lock userPoolLock = new ReentrantLock();
+    private static final Lock permPoolLock = new ReentrantLock();
     private static Cache ouCache;
 
     // DAO class for OU data sets must be initializer before the other statics:
@@ -95,22 +96,42 @@ public final class OrgUnitP
     final boolean isValid( OrgUnit entity )
     {
         boolean result = false;
+        
         if ( entity.type == OrgUnit.Type.USER )
         {
-            Set<String> userPool = getOrgSet( entity );
-            if ( userPool != null && entity.getType() == OrgUnit.Type.USER )
+            try
+            {
+                userPoolLock.lock();
+                Set<String> userPool = getUserSet( entity );
+
+                if ( userPool != null )
+                {
+                    result = userPool.contains( entity.getName() );
+                }
+            }
+            finally
             {
-                result = userPool.contains( entity.getName() );
+                userPoolLock.unlock();
             }
         }
         else
         {
-            Set<String> permPool = getOrgSet( entity );
-            if ( permPool != null )
+            try
             {
-                result = permPool.contains( entity.getName() );
+                permPoolLock.lock();
+                Set<String> permPool = getPermSet( entity );
+
+                if ( permPool != null )
+                {
+                    result = permPool.contains( entity.getName() );
+                }
+            }
+            finally
+            {
+                permPoolLock.unlock();
             }
         }
+        
         return result;
     }
 
@@ -122,6 +143,7 @@ public final class OrgUnitP
     private static Set<String> loadOrgSet( OrgUnit orgUnit )
     {
         Set<String> ouSet = null;
+        
         try
         {
             ouSet = oDao.getOrgs( orgUnit );
@@ -131,6 +153,7 @@ public final class OrgUnitP
             String warning = "loadOrgSet static initializer caught SecurityException=" +
se;
             LOG.info( warning, se );
         }
+        
         if ( orgUnit.getType() == OrgUnit.Type.USER )
         {
             // TODO:  add context id to this cache
@@ -147,26 +170,55 @@ public final class OrgUnitP
 
     /**
      *
-     * @param orgUnit will either be a User or Perm OU.
-     * @return Set containing the OU mapping to a particular type and tenant.
+     * @param orgUnit will be a Perm OU.
+     * @return Set containing the OU mapping to a Perm type and tenant.
      */
-    private static Set<String> getOrgSet( OrgUnit orgUnit )
+    private static Set<String> getPermSet( OrgUnit orgUnit )
     {
-        Set<String> orgSet;
-        if ( orgUnit.getType() == OrgUnit.Type.USER )
+        try
         {
-            orgSet = ( Set<String> ) ouCache.get( getKey( USER_OUS, orgUnit.getContextId()
) );
+            permPoolLock.lock();
+            @SuppressWarnings("unchecked")
+            Set<String> permSet = ( Set<String> ) ouCache.get( getKey( PERM_OUS,
orgUnit.getContextId() ) );
+
+            if ( permSet == null )
+            {
+                permSet = loadOrgSet( orgUnit );
+            }
+            
+            return permSet;
         }
-        else
+        finally
         {
-            orgSet = ( Set<String> ) ouCache.get( getKey( PERM_OUS, orgUnit.getContextId()
) );
+            permPoolLock.unlock();
         }
+    }
+
 
-        if ( orgSet == null )
+    /**
+     *
+     * @param orgUnit will be a User OU
+     * @return Set containing the OU mapping to the user type and tenant.
+     */
+    private static Set<String> getUserSet( OrgUnit orgUnit )
+    {
+        try
+        {
+            userPoolLock.lock();
+            @SuppressWarnings("unchecked")
+            Set<String> userSet = ( Set<String> ) ouCache.get( getKey( USER_OUS,
orgUnit.getContextId() ) );
+
+            if ( userSet == null )
+            {
+                userSet = loadOrgSet( orgUnit );
+            }
+            
+            return userSet;
+        }
+        finally
         {
-            orgSet = loadOrgSet( orgUnit );
+            userPoolLock.unlock();
         }
-        return orgSet;
     }
 
 
@@ -181,6 +233,7 @@ public final class OrgUnitP
     final OrgUnit read( OrgUnit entity ) throws SecurityException
     {
         validate( entity, false );
+        
         return oDao.findByKey( entity );
     }
 
@@ -213,24 +266,44 @@ public final class OrgUnitP
     {
         validate( entity, false );
         OrgUnit oe = oDao.create( entity );
+        
         if ( entity.getType() == OrgUnit.Type.USER )
         {
-            Set<String> userPool = getOrgSet( entity );
-            synchronized ( userPoolSynchLock )
+            try
             {
+                userPoolLock.lock();
+
+                Set<String> userPool = getUserSet( entity );
+                
                 if ( userPool != null )
+                {
                     userPool.add( entity.getName() );
+                }
+            }
+            finally
+            {
+                userPoolLock.unlock();
             }
         }
         else
         {
-            Set<String> permPool = getOrgSet( entity );
-            synchronized ( permPoolSynchLock )
+            try
             {
+                permPoolLock.lock();
+
+                Set<String> permPool = getPermSet( entity );
+                
                 if ( permPool != null )
+                {
                     permPool.add( entity.getName() );
+                }
+            }
+            finally
+            {
+                permPoolLock.unlock();
             }
         }
+        
         return oe;
     }
 
@@ -248,6 +321,7 @@ public final class OrgUnitP
     final OrgUnit update( OrgUnit entity ) throws SecurityException
     {
         validate( entity, false );
+        
         return oDao.update( entity );
     }
 
@@ -279,24 +353,42 @@ public final class OrgUnitP
     final OrgUnit delete( OrgUnit entity ) throws SecurityException
     {
         oDao.remove( entity );
+        
         if ( entity.getType() == OrgUnit.Type.USER )
         {
-            Set<String> userPool = getOrgSet( entity );
-            synchronized ( userPoolSynchLock )
+            try
             {
+                userPoolLock.lock();
+                Set<String> userPool = getUserSet( entity );
+
                 if ( userPool != null )
+                {
                     userPool.remove( entity.getName() );
+                }
+            }
+            finally
+            {
+                userPoolLock.unlock();
             }
         }
         else
         {
-            Set<String> permPool = getOrgSet( entity );
-            synchronized ( permPoolSynchLock )
+            try
             {
+                permPoolLock.lock();
+                Set<String> permPool = getPermSet( entity );
+
                 if ( permPool != null )
+                {
                     permPool.remove( entity.getName() );
+                }
+            }
+            finally
+            {
+                permPoolLock.unlock();
             }
         }
+        
         return entity;
     }
 
@@ -327,14 +419,17 @@ public final class OrgUnitP
         throws SecurityException
     {
         VUtil.safeText( entity.getName(), GlobalIds.OU_LEN );
+        
         if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
         {
             VUtil.description( entity.getDescription() );
         }
+        
         if ( entity.getType() == null )
         {
             String error = "validate null or empty org unit type";
             int errCode;
+            
             if ( entity.getType() == OrgUnit.Type.PERM )
             {
                 errCode = GlobalErrIds.ORG_TYPE_NULL_PERM;
@@ -343,6 +438,7 @@ public final class OrgUnitP
             {
                 errCode = GlobalErrIds.ORG_TYPE_NULL_USER;
             }
+            
             throw new SecurityException( errCode, error );
         }
     }
@@ -358,11 +454,12 @@ public final class OrgUnitP
     private static String getKey( String type, String contextId )
     {
         String key = type;
+        
         if ( VUtil.isNotNullOrEmpty( contextId ) && !contextId.equalsIgnoreCase(
GlobalIds.NULL ) )
         {
             key += ":" + contextId;
-
         }
+        
         return key;
     }
 }
\ No newline at end of file


Mime
View raw message