directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject [directory-fortress-core] branch FC-265 updated: only populate payload with session on AccessMgr & DelAccessMgr calls. Fix bug where changePassword tries to set audit data w/out a session.
Date Fri, 15 Mar 2019 22:35:32 GMT
This is an automated email from the ASF dual-hosted git repository.

smckinney pushed a commit to branch FC-265
in repository https://gitbox.apache.org/repos/asf/directory-fortress-core.git


The following commit(s) were added to refs/heads/FC-265 by this push:
     new 9b12dc1  only populate payload with session on AccessMgr & DelAccessMgr calls.  Fix bug where changePassword tries to set audit data w/out a session.
9b12dc1 is described below

commit 9b12dc12ff2c67287fdf9b9e0f587a06784f6a88
Author: Shawn McKinney <smckinney@apache.org>
AuthorDate: Fri Mar 15 17:35:25 2019 -0500

    only populate payload with session on AccessMgr & DelAccessMgr calls.  Fix bug where changePassword tries to set audit data w/out a session.
---
 .../directory/fortress/core/impl/AdminMgrImpl.java |   1 -
 .../directory/fortress/core/impl/Manageable.java   |   1 -
 .../directory/fortress/core/impl/UserDAO.java      |   2 +-
 .../fortress/core/rest/AdminMgrRestImpl.java       | 196 ---------------------
 .../fortress/core/rest/AuditMgrRestImpl.java       |  24 ---
 .../fortress/core/rest/DelAdminMgrRestImpl.java    | 104 -----------
 .../fortress/core/rest/DelReviewMgrRestImpl.java   |  24 ---
 .../fortress/core/rest/GroupMgrRestImpl.java       |  10 +-
 .../fortress/core/rest/PwPolicyMgrRestImpl.java    |  14 +-
 .../fortress/core/rest/ReviewMgrRestImpl.java      | 156 ----------------
 10 files changed, 13 insertions(+), 519 deletions(-)

diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java
index 2e58816..485f155 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java
@@ -169,7 +169,6 @@ public final class AdminMgrImpl extends Manageable implements AdminMgr, Serializ
         String methodName = "updateUser";
         assertContext( CLS_NM, methodName, user, GlobalErrIds.USER_NULL );
         setEntitySession( CLS_NM, methodName, user );
-        setEntitySession( CLS_NM, methodName, user );
         // Perform delegated admin check:
         AdminUtil.canDo( adminSess, user, contextId, false );
         return userP.update( user );
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/Manageable.java b/src/main/java/org/apache/directory/fortress/core/impl/Manageable.java
index bb8e605..1347ae6 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/Manageable.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/Manageable.java
@@ -132,7 +132,6 @@ public abstract class Manageable implements org.apache.directory.fortress.core.M
         if (this.adminSess != null)
         {
             Permission perm = new Permission(className, opName);
-            entity.setAdminSession(this.adminSess);
             entity.setModCode(AdminUtil.getObjName(perm.getObjName()) + "." + perm.getOpName());
         }
         
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
index a14ec64..ba7b513 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
@@ -1735,7 +1735,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
             modify( ld, userDn, mods );
 
             // This modify update audit attributes on the User entry (if enabled):
-            if ( Config.getInstance().isOpenldap() && ! Config.getInstance().isAuditDisabled() )
+            if ( entity.getAdminSession() != null && Config.getInstance().isOpenldap() && ! Config.getInstance().isAuditDisabled() )
             {
                 mods = new ArrayList<>();
                 modify( ld, userDn, mods, entity );
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java
index 7bc35c0..652bb7f 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java
@@ -92,10 +92,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         User retUser;
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( user );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.USER_ADD );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -121,10 +117,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         VUtil.assertNotNull( user, GlobalErrIds.USER_NULL, CLS_NM + ".disableUser" );
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( user );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.USER_DISABLE );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -145,10 +137,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         VUtil.assertNotNull( user, GlobalErrIds.USER_NULL, CLS_NM + ".deleteUser" );
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( user );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.USER_DELETE );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -170,10 +158,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         User retUser;
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( user );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.USER_UPDATE );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -201,10 +185,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         FortRequest request = RestUtils.getRequest( this.contextId );
         user.setNewPassword( newPassword );
         request.setEntity( user );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.USER_CHGPW );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -225,10 +205,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         VUtil.assertNotNull( user, GlobalErrIds.USER_NULL, CLS_NM + ".lockUserAccount" );
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( user );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.USER_LOCK );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -249,10 +225,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         VUtil.assertNotNull( user, GlobalErrIds.USER_NULL, CLS_NM + ".unlockUserAccount" );
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( user );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.USER_UNLOCK );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -275,10 +247,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         FortRequest request = RestUtils.getRequest( this.contextId );
         user.setNewPassword( newPassword );
         request.setEntity( user );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.USER_RESET );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -312,10 +280,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         Role retRole;
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( role );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_ADD );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -341,10 +305,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         VUtil.assertNotNull( role, GlobalErrIds.ROLE_NULL, CLS_NM + ".deleteRole" );
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( role );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_DELETE );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -366,10 +326,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         Role retRole;
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( role );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_UPDATE );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -395,10 +351,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         VUtil.assertNotNull( uRole, GlobalErrIds.URLE_NULL, CLS_NM + ".assignUser" );
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( uRole );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_ASGN );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -419,10 +371,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         VUtil.assertNotNull( uRole, GlobalErrIds.URLE_NULL, CLS_NM + ".deassignUser" );
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( uRole );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_DEASGN );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -444,10 +392,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         Permission retPerm;
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( perm );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.PERM_ADD );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -474,10 +418,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         Permission retPerm;
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( perm );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.PERM_UPDATE );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -503,10 +443,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         VUtil.assertNotNull( perm, GlobalErrIds.PERM_OPERATION_NULL, CLS_NM + ".deletePermission" );
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( perm );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.PERM_DELETE );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -528,10 +464,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         PermObj retObj;
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( pObj );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.OBJ_ADD );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -558,10 +490,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         PermObj retObj;
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( pObj );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.OBJ_UPDATE );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -587,10 +515,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         VUtil.assertNotNull( pObj, GlobalErrIds.PERM_OBJECT_NULL, CLS_NM + ".deletePermObj" );
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( pObj );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.OBJ_DELETE );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -618,10 +542,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         permGrant.setOpName( perm.getOpName() );
         permGrant.setRoleNm( role.getName() );
         request.setEntity( permGrant );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_GRANT );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -649,10 +569,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         permGrant.setOpName( perm.getOpName() );
         permGrant.setRoleNm( role.getName() );
         request.setEntity( permGrant );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_REVOKE );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -680,10 +596,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         permGrant.setOpName( perm.getOpName() );
         permGrant.setUserId( user.getUserId() );
         request.setEntity( permGrant );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.USER_GRANT );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -711,10 +623,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         permGrant.setOpName( perm.getOpName() );
         permGrant.setUserId( user.getUserId() );
         request.setEntity( permGrant );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.USER_REVOKE );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -739,10 +647,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         relationship.setParent( parentRole );
         relationship.setChild( childRole );
         request.setEntity( relationship );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_DESC );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -767,10 +671,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         relationship.setParent( parentRole );
         relationship.setChild( childRole );
         request.setEntity( relationship );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_ASC );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -795,10 +695,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         relationship.setParent( parentRole );
         relationship.setChild( childRole );
         request.setEntity( relationship );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_ADDINHERIT );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -823,10 +719,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         relationship.setParent( parentRole );
         relationship.setChild( childRole );
         request.setEntity( relationship );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_DELINHERIT );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -848,10 +740,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         SDSet retSet;
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( ssdSet );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.SSD_ADD );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -877,10 +765,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         SDSet retSet;
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( ssdSet );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.SSD_UPDATE );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -909,10 +793,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( ssdSet );
         request.setValue( role.getName() );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.SSD_ADD_MEMBER );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -941,10 +821,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( ssdSet );
         request.setValue( role.getName() );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.SSD_DEL_MEMBER );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -971,10 +847,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         SDSet retSet;
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( ssdSet );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.SSD_DELETE );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -1002,10 +874,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         FortRequest request = RestUtils.getRequest( this.contextId );
         ssdSet.setCardinality( cardinality );
         request.setEntity( ssdSet );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.SSD_CARD_UPDATE );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -1032,10 +900,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         SDSet retSet;
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( dsdSet );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.DSD_ADD );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -1061,10 +925,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         SDSet retSet;
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( dsdSet );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.DSD_UPDATE );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -1093,10 +953,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( dsdSet );
         request.setValue( role.getName() );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.DSD_ADD_MEMBER );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -1125,10 +981,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( dsdSet );
         request.setValue( role.getName() );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.DSD_DEL_MEMBER );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -1155,10 +1007,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         SDSet retSet;
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( dsdSet );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.DSD_DELETE );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -1186,10 +1034,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         FortRequest request = RestUtils.getRequest( this.contextId );
         dsdSet.setCardinality( cardinality );
         request.setEntity( dsdSet );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.DSD_CARD_UPDATE );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -1218,10 +1062,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( uRole );
         request.setEntity2( roleConstraint );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_ADD_CONSTRAINT );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -1248,10 +1088,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( uRole );
         request.setEntity2( roleConstraint );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_DELETE_CONSTRAINT );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -1273,10 +1109,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         PermissionAttributeSet retSet;
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( permAttributeSet );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.PERM_ADD_ATTRIBUTE_SET );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -1302,10 +1134,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         VUtil.assertNotNull( permAttributeSet, GlobalErrIds.PERM_ATTRIBUTE_SET_NULL, CLS_NM + ".deletePermissionAttributeSet" );
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( permAttributeSet );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.PERM_DELETE_ATTRIBUTE_SET );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -1329,10 +1157,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( permAttribute );
         request.setValue( attributeSetName );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.PERM_ADD_PERM_ATTRIBUTE_TO_SET );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -1360,10 +1184,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( permAttribute );
         request.setValue( attributeSetName );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.PERM_DELETE_PERM_ATTRIBUTE_TO_SET );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -1388,10 +1208,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         request.setEntity( permAttribute );
         request.setValue( attributeSetName );
         request.setIsFlag( replaceValidValues );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.PERM_UPDATE_PERM_ATTRIBUTE_IN_SET );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -1414,10 +1230,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( uRole );
         request.setValue( roleConstraintId );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_DELETE_CONSTRAINT_ID );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -1440,10 +1252,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( role );
         request.setEntity2( roleConstraint );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_ENABLE_CONSTRAINT );
         FortResponse response = RestUtils.unmarshall( szResponse );
@@ -1466,10 +1274,6 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity( role );
         request.setEntity2( roleConstraint );
-        if ( this.adminSess != null )
-        {
-            request.setSession( adminSess );
-        }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_DISABLE_CONSTRAINT );
         FortResponse response = RestUtils.unmarshall( szResponse );
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/AuditMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/AuditMgrRestImpl.java
index d502ca0..e06a313 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/AuditMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/AuditMgrRestImpl.java
@@ -121,10 +121,6 @@ public class AuditMgrRestImpl extends Manageable implements AuditMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(uAudit);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.AUDIT_UAUTHZS);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -157,10 +153,6 @@ public class AuditMgrRestImpl extends Manageable implements AuditMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(uAudit);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.AUDIT_AUTHZS);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -193,10 +185,6 @@ public class AuditMgrRestImpl extends Manageable implements AuditMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(uAudit);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.AUDIT_BINDS);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -229,10 +217,6 @@ public class AuditMgrRestImpl extends Manageable implements AuditMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(uAudit);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.AUDIT_SESSIONS);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -265,10 +249,6 @@ public class AuditMgrRestImpl extends Manageable implements AuditMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(uAudit);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.AUDIT_MODS);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -301,10 +281,6 @@ public class AuditMgrRestImpl extends Manageable implements AuditMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(uAudit);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.AUDIT_INVLD);
         FortResponse response = RestUtils.unmarshall(szResponse);
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/DelAdminMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/DelAdminMgrRestImpl.java
index eddba9f..4d42fe9 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/DelAdminMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/DelAdminMgrRestImpl.java
@@ -69,10 +69,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(role);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_ADD);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -99,10 +95,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(role);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_DELETE);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -125,10 +117,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(role);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_UPDATE);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -155,10 +143,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(uAdminRole);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_ASGN);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -180,10 +164,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(uAdminRole);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_DEASGN);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -206,10 +186,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(entity);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ORG_ADD);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -237,10 +213,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(entity);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ORG_UPDATE);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -268,10 +240,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(entity);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ORG_DELETE);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -304,10 +272,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         relationship.setParent(parent);
         relationship.setChild(child);
         request.setEntity(relationship);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ORG_DESC);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -334,10 +298,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         relationship.setParent(parent);
         relationship.setChild(child);
         request.setEntity(relationship);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ORG_ASC);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -365,10 +325,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         relationship.setParent(parent);
         relationship.setChild(child);
         request.setEntity(relationship);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ORG_ADDINHERIT);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -396,10 +352,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         relationship.setParent(parent);
         relationship.setChild(child);
         request.setEntity(relationship);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ORG_DELINHERIT);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -426,10 +378,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         relationship.setParent(parentRole);
         relationship.setChild(childRole);
         request.setEntity(relationship);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_DESC);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -456,10 +404,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         relationship.setParent(parentRole);
         relationship.setChild(childRole);
         request.setEntity(relationship);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_ASC);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -486,10 +430,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         relationship.setParent(parentRole);
         relationship.setChild(childRole);
         request.setEntity(relationship);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_ADDINHERIT);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -516,10 +456,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         relationship.setParent(parentRole);
         relationship.setChild(childRole);
         request.setEntity(relationship);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_DELINHERIT);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -543,10 +479,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         request.setContextId(this.contextId);
         perm.setAdmin(true);
         request.setEntity(perm);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.PERM_ADD);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -575,10 +507,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         request.setContextId(this.contextId);
         perm.setAdmin(true);
         request.setEntity(perm);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.PERM_UPDATE);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -606,10 +534,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         request.setContextId(this.contextId);
         perm.setAdmin(true);
         request.setEntity(perm);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.PERM_DELETE);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -633,10 +557,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         request.setContextId(this.contextId);
         pObj.setAdmin(true);
         request.setEntity(pObj);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.OBJ_ADD);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -665,10 +585,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         request.setContextId(this.contextId);
         pObj.setAdmin(true);
         request.setEntity(pObj);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.OBJ_UPDATE);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -696,10 +612,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         request.setContextId(this.contextId);
         pObj.setAdmin(true);
         request.setEntity(pObj);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.OBJ_DELETE);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -728,10 +640,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         permGrant.setOpName(perm.getOpName());
         permGrant.setRoleNm(role.getName());
         request.setEntity(permGrant);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ROLE_GRANT);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -760,10 +668,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         permGrant.setOpName(perm.getOpName());
         permGrant.setRoleNm(role.getName());
         request.setEntity(permGrant);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ROLE_REVOKE);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -792,10 +696,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         permGrant.setOpName(perm.getOpName());
         permGrant.setUserId(user.getUserId());
         request.setEntity(permGrant);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.USER_GRANT);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -824,10 +724,6 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
         permGrant.setOpName(perm.getOpName());
         permGrant.setUserId(user.getUserId());
         request.setEntity(permGrant);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.USER_REVOKE);
         FortResponse response = RestUtils.unmarshall(szResponse);
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/DelReviewMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/DelReviewMgrRestImpl.java
index 411db8c..ab85bb7 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/DelReviewMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/DelReviewMgrRestImpl.java
@@ -68,10 +68,6 @@ public class DelReviewMgrRestImpl extends Manageable implements DelReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(role);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_READ);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -99,10 +95,6 @@ public class DelReviewMgrRestImpl extends Manageable implements DelReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setValue(searchVal);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_SEARCH);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -130,10 +122,6 @@ public class DelReviewMgrRestImpl extends Manageable implements DelReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(user);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_ASGNED);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -161,10 +149,6 @@ public class DelReviewMgrRestImpl extends Manageable implements DelReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(role);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.USER_ASGNED_ADMIN);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -197,10 +181,6 @@ public class DelReviewMgrRestImpl extends Manageable implements DelReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(entity);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ORG_READ);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -229,10 +209,6 @@ public class DelReviewMgrRestImpl extends Manageable implements DelReviewMgr
         request.setContextId(this.contextId);
         OrgUnit inOrg = new OrgUnit(searchVal, type);
         request.setEntity(inOrg);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ORG_SEARCH);
         FortResponse response = RestUtils.unmarshall(szResponse);
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/GroupMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/GroupMgrRestImpl.java
index 94b5e82..baca3b7 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/GroupMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/GroupMgrRestImpl.java
@@ -56,7 +56,7 @@ public class GroupMgrRestImpl  extends Manageable implements GroupMgr
         request.setEntity( group );
         if ( this.adminSess != null )
         {
-            request.setSession( adminSess );
+            ////request.setSession( adminSess );
         }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.GROUP_ADD );
@@ -84,7 +84,7 @@ public class GroupMgrRestImpl  extends Manageable implements GroupMgr
         request.setEntity( group );
         if ( this.adminSess != null )
         {
-            request.setSession( adminSess );
+            ////request.setSession( adminSess );
         }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.GROUP_UPDATE );
@@ -112,7 +112,7 @@ public class GroupMgrRestImpl  extends Manageable implements GroupMgr
         request.setEntity( group );
         if ( this.adminSess != null )
         {
-            request.setSession( adminSess );
+            ////request.setSession( adminSess );
         }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.GROUP_DELETE );
@@ -263,7 +263,7 @@ public class GroupMgrRestImpl  extends Manageable implements GroupMgr
         request.setValue( member );
         if ( this.adminSess != null )
         {
-            request.setSession( adminSess );
+            ////request.setSession( adminSess );
         }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.GROUP_ASGN );
@@ -293,7 +293,7 @@ public class GroupMgrRestImpl  extends Manageable implements GroupMgr
         request.setValue( member );
         if ( this.adminSess != null )
         {
-            request.setSession( adminSess );
+            ////request.setSession( adminSess );
         }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.GROUP_DEASGN );
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/PwPolicyMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/PwPolicyMgrRestImpl.java
index bca0ca2..e262527 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/PwPolicyMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/PwPolicyMgrRestImpl.java
@@ -78,7 +78,7 @@ public class PwPolicyMgrRestImpl extends Manageable implements PwPolicyMgr
         request.setEntity( policy );
         if ( this.adminSess != null )
         {
-            request.setSession( adminSess );
+            ////request.setSession( adminSess );
         }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.PSWD_ADD );
@@ -102,7 +102,7 @@ public class PwPolicyMgrRestImpl extends Manageable implements PwPolicyMgr
         request.setEntity( policy );
         if ( this.adminSess != null )
         {
-            request.setSession( adminSess );
+            ////request.setSession( adminSess );
         }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.PSWD_UPDATE );
@@ -126,7 +126,7 @@ public class PwPolicyMgrRestImpl extends Manageable implements PwPolicyMgr
         request.setEntity( policy );
         if ( this.adminSess != null )
         {
-            request.setSession( adminSess );
+            ////request.setSession( adminSess );
         }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.PSWD_DELETE );
@@ -151,7 +151,7 @@ public class PwPolicyMgrRestImpl extends Manageable implements PwPolicyMgr
         request.setEntity( new PwPolicy( name ) );
         if ( this.adminSess != null )
         {
-            request.setSession( adminSess );
+            ////request.setSession( adminSess );
         }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.PSWD_READ );
@@ -181,7 +181,7 @@ public class PwPolicyMgrRestImpl extends Manageable implements PwPolicyMgr
         request.setEntity( new PwPolicy( searchVal ) );
         if ( this.adminSess != null )
         {
-            request.setSession( adminSess );
+            ////request.setSession( adminSess );
         }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.PSWD_SEARCH );
@@ -213,7 +213,7 @@ public class PwPolicyMgrRestImpl extends Manageable implements PwPolicyMgr
         request.setValue( userId );
         if ( this.adminSess != null )
         {
-            request.setSession( adminSess );
+            ////request.setSession( adminSess );
         }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.PSWD_USER_ADD );
@@ -237,7 +237,7 @@ public class PwPolicyMgrRestImpl extends Manageable implements PwPolicyMgr
         request.setValue( userId );
         if ( this.adminSess != null )
         {
-            request.setSession( adminSess );
+            ////request.setSession( adminSess );
         }
         String szRequest = RestUtils.marshal( request );
         String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.PSWD_USER_DELETE );
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java
index 032056d..da4b6cf 100755
--- a/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java
@@ -94,10 +94,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(permission);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.PERM_READ);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -125,10 +121,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(permObj);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.OBJ_READ);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -156,10 +148,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(permission);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.PERM_SEARCH);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -187,10 +175,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(permObj);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.PERM_OBJ_SEARCH);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -218,10 +202,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(permission);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.PERM_SEARCH_ANY);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -249,10 +229,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(permObj);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.OBJ_SEARCH);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -282,10 +258,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         PermObj inObj = new PermObj();
         inObj.setOu(ou.getName());
         request.setEntity(inObj);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.OBJ_SEARCH);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -313,10 +285,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(role);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ROLE_READ);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -344,10 +312,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setValue(searchVal);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ROLE_SEARCH);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -376,10 +340,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         request.setContextId(this.contextId);
         request.setValue(searchVal);
         request.setLimit(limit);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ROLE_SEARCH);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -407,10 +367,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(user);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.USER_READ);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -438,10 +394,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(user);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.USER_SEARCH);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -471,10 +423,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         User inUser = new User();
         inUser.setOu( ou.getName() );
         request.setEntity(inUser);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.USER_SEARCH);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -503,10 +451,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         request.setContextId(this.contextId);
         request.setLimit( limit );
         request.setEntity(user);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.USER_SEARCH);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -535,10 +479,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         request.setContextId(this.contextId);
         request.setLimit(limit);
         request.setEntity(role);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.USER_ASGNED);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -570,10 +510,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         List<User> retUsers;
         FortRequest request = RestUtils.getRequest( this.contextId );
         request.setEntity(role);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.USER_ASGNED);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -601,10 +537,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(user);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ROLE_ASGNED);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -632,10 +564,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setValue( userId );
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ROLE_ASGNED);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -663,10 +591,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity( role );
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ROLE_AUTHZED);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -698,10 +622,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(user);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.USER_AUTHZED);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -743,10 +663,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         request.setContextId(this.contextId);
         request.setEntity(role);
         request.setIsFlag( noInheritance );
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ROLE_PERMS);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -774,10 +690,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         request.setContextId(this.contextId);
         request.setEntity(role);
         request.setIsFlag( noInhertiance );
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ROLE_PERM_ATTR_SETS);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -804,10 +716,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(user);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.USER_PERMS);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -835,10 +743,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(perm);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.PERM_ROLES);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -866,10 +770,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(perm);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.PERM_ROLES_AUTHZED);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -899,10 +799,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(perm);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.PERM_USERS);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -930,10 +826,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(perm);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.PERM_USERS_AUTHZED);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -963,10 +855,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(role);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.SSD_ROLE_SETS);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -998,10 +886,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(set);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.SSD_READ);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -1028,10 +912,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
          FortRequest request = new FortRequest();
          request.setContextId(this.contextId);
          request.setEntity(ssd);
-         if (this.adminSess != null)
-         {
-             request.setSession(adminSess);
-         }
          String szRequest = RestUtils.marshal(request);
          String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.SSD_SETS);
          FortResponse response = RestUtils.unmarshall(szResponse);
@@ -1063,10 +943,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(ssd);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.SSD_ROLES);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -1096,10 +972,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(ssd);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.SSD_CARD);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -1127,10 +999,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(role);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.DSD_ROLE_SETS);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -1162,10 +1030,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(set);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.DSD_READ);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -1192,10 +1056,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
          FortRequest request = new FortRequest();
          request.setContextId(this.contextId);
          request.setEntity(dsd);
-         if (this.adminSess != null)
-         {
-             request.setSession(adminSess);
-         }
          String szRequest = RestUtils.marshal(request);
          String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.DSD_SETS);
          FortResponse response = RestUtils.unmarshall(szResponse);
@@ -1227,10 +1087,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(dsd);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.DSD_ROLES);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -1260,10 +1116,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         FortRequest request = new FortRequest();
         request.setContextId(this.contextId);
         request.setEntity(dsd);
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.DSD_CARD);
         FortResponse response = RestUtils.unmarshall(szResponse);
@@ -1292,10 +1144,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
             FortRequest request = new FortRequest();
             request.setContextId(this.contextId);
             request.setEntity(permAttributeSet);
-            if (this.adminSess != null)
-            {
-                request.setSession(adminSess);
-            }
             String szRequest = RestUtils.marshal(request);
             String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.PERM_READ_PERM_ATTRIBUTE_SET);
             FortResponse response = RestUtils.unmarshall(szResponse);
@@ -1328,10 +1176,6 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
         request.setEntity( user );
         request.setEntity2( permission);
         request.setValue( rcType.toString() );
-        if (this.adminSess != null)
-        {
-            request.setSession(adminSess);
-        }
         String szRequest = RestUtils.marshal(request);
         String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ROLE_FIND_CONSTRAINTS);
         FortResponse response = RestUtils.unmarshall(szResponse);


Mime
View raw message