You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2018/07/12 18:16:33 UTC
directory-fortress-core git commit: FC-236 - getMessage() on
LDAPExceptions returns empty
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 3acd9ea63 -> 6dc2472ae
FC-236 - getMessage() on LDAPExceptions returns empty
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/6dc2472a
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/6dc2472a
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/6dc2472a
Branch: refs/heads/master
Commit: 6dc2472ae5792ad9934cd2ddeb9a427e80701b32
Parents: 3acd9ea
Author: Shawn McKinney <sm...@apache.org>
Authored: Thu Jul 12 13:16:29 2018 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Thu Jul 12 13:16:29 2018 -0500
----------------------------------------------------------------------
.../fortress/core/impl/AdminRoleDAO.java | 22 +++----
.../directory/fortress/core/impl/AuditDAO.java | 12 ++--
.../directory/fortress/core/impl/ConfigDAO.java | 12 ++--
.../directory/fortress/core/impl/GroupDAO.java | 22 +++----
.../fortress/core/impl/OrgUnitDAO.java | 2 +-
.../core/impl/OrganizationalUnitDAO.java | 2 +-
.../directory/fortress/core/impl/PermDAO.java | 60 ++++++++++----------
.../directory/fortress/core/impl/PolicyDAO.java | 12 ++--
.../fortress/core/impl/PropertyDAO.java | 6 +-
.../directory/fortress/core/impl/RoleDAO.java | 24 ++++----
.../directory/fortress/core/impl/SdDAO.java | 12 ++--
.../directory/fortress/core/impl/SuffixDAO.java | 4 +-
.../directory/fortress/core/impl/UserDAO.java | 52 ++++++++---------
.../core/ldap/LdapConnectionProvider.java | 18 +++---
14 files changed, 130 insertions(+), 130 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6dc2472a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
index 786ed4e..b32c25c 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
@@ -191,7 +191,7 @@ final class AdminRoleDAO extends LdapDataProvider implements PropertyProvider<Ad
}
catch ( LdapException e )
{
- String error = "create role [" + entity.getName() + "] caught LdapException=" + e.getMessage();
+ String error = "create role [" + entity.getName() + "] caught LdapException=" + e;
throw new CreateException( GlobalErrIds.ARLE_ADD_FAILED, error, e );
}
finally
@@ -267,7 +267,7 @@ final class AdminRoleDAO extends LdapDataProvider implements PropertyProvider<Ad
}
catch ( LdapException e )
{
- String error = "update name [" + entity.getName() + "] caught LdapException=" + e.getMessage();
+ String error = "update name [" + entity.getName() + "] caught LdapException=" + e;
throw new UpdateException( GlobalErrIds.ARLE_UPDATE_FAILED, error, e );
}
finally
@@ -298,7 +298,7 @@ final class AdminRoleDAO extends LdapDataProvider implements PropertyProvider<Ad
}
catch ( LdapException e )
{
- String error = "deleteParent name [" + entity.getName() + "] caught LdapException=" + e.getMessage();
+ String error = "deleteParent name [" + entity.getName() + "] caught LdapException=" + e;
throw new UpdateException( GlobalErrIds.ARLE_REMOVE_PARENT_FAILED, error, e );
}
finally
@@ -332,7 +332,7 @@ final class AdminRoleDAO extends LdapDataProvider implements PropertyProvider<Ad
catch ( LdapException e )
{
String error = "assign role name [" + entity.getName() + "] user dn [" + userDn + "] caught LdapException="
- + e.getMessage();
+ + e;
throw new UpdateException( GlobalErrIds.ARLE_USER_ASSIGN_FAILED, error, e );
}
finally
@@ -369,7 +369,7 @@ final class AdminRoleDAO extends LdapDataProvider implements PropertyProvider<Ad
catch ( LdapException e )
{
String error = "deassign role name [" + entity.getName() + "] user dn [" + userDn
- + "] caught LdapException=" + e.getMessage();
+ + "] caught LdapException=" + e;
throw new UpdateException( GlobalErrIds.ARLE_USER_DEASSIGN_FAILED, error, e );
}
finally
@@ -399,7 +399,7 @@ final class AdminRoleDAO extends LdapDataProvider implements PropertyProvider<Ad
}
catch ( LdapException e )
{
- String error = "remove role name=" + role.getName() + " LdapException=" + e.getMessage();
+ String error = "remove role name=" + role.getName() + " LdapException=" + e;
throw new RemoveException( GlobalErrIds.ARLE_DELETE_FAILED, error, e );
}
finally
@@ -444,7 +444,7 @@ final class AdminRoleDAO extends LdapDataProvider implements PropertyProvider<Ad
}
catch ( LdapException e )
{
- String error = "getRole dn [" + dn + "] LEXCD=" + e.getMessage();
+ String error = "getRole dn [" + dn + "] LEXCD=" + e;
throw new FinderException( GlobalErrIds.ARLE_READ_FAILED, error, e );
}
finally
@@ -486,7 +486,7 @@ final class AdminRoleDAO extends LdapDataProvider implements PropertyProvider<Ad
}
catch ( LdapException e )
{
- String error = "findRoles name [" + adminRole.getName() + "] caught LdapException=" + e.getMessage();
+ String error = "findRoles name [" + adminRole.getName() + "] caught LdapException=" + e;
throw new FinderException( GlobalErrIds.ARLE_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -535,7 +535,7 @@ final class AdminRoleDAO extends LdapDataProvider implements PropertyProvider<Ad
}
catch ( LdapException e )
{
- String error = "findRoles name [" + searchVal + "] caught LdapException=" + e.getMessage();
+ String error = "findRoles name [" + searchVal + "] caught LdapException=" + e;
throw new FinderException( GlobalErrIds.ARLE_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -578,7 +578,7 @@ final class AdminRoleDAO extends LdapDataProvider implements PropertyProvider<Ad
}
catch ( LdapException e )
{
- String error = "findAssignedRoles userDn [" + userDn + "] caught LdapException=" + e.getMessage();
+ String error = "findAssignedRoles userDn [" + userDn + "] caught LdapException=" + e;
throw new FinderException( GlobalErrIds.ARLE_OCCUPANT_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -627,7 +627,7 @@ final class AdminRoleDAO extends LdapDataProvider implements PropertyProvider<Ad
}
catch ( LdapException e )
{
- String error = "getAllDescendants filter [" + filter + "] caught LdapException=" + e.getMessage();
+ String error = "getAllDescendants filter [" + filter + "] caught LdapException=" + e;
throw new FinderException( GlobalErrIds.ARLE_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6dc2472a/src/main/java/org/apache/directory/fortress/core/impl/AuditDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AuditDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/AuditDAO.java
index 4ce23fe..5cac8dc 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AuditDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AuditDAO.java
@@ -290,7 +290,7 @@ final class AuditDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "LdapException in AuditDAO.searchAuthZs id=" + e.getMessage();
+ String error = "LdapException in AuditDAO.searchAuthZs id=" + e;
throw new FinderException( GlobalErrIds.AUDT_AUTHN_INVALID_FAILED, error, e );
}
catch ( CursorException e )
@@ -355,7 +355,7 @@ final class AuditDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "LdapException in AuditDAO.searchAuthZs id=" + e.getMessage();
+ String error = "LdapException in AuditDAO.searchAuthZs id=" + e;
throw new FinderException( GlobalErrIds.AUDT_AUTHZ_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -445,7 +445,7 @@ final class AuditDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "LdapException in AuditDAO.getAllAuthZs id=" + e.getMessage();
+ String error = "LdapException in AuditDAO.getAllAuthZs id=" + e;
throw new FinderException( GlobalErrIds.AUDT_AUTHZ_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -528,7 +528,7 @@ final class AuditDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "LdapException in AuditDAO.searchBinds id=" + e.getMessage();
+ String error = "LdapException in AuditDAO.searchBinds id=" + e;
throw new FinderException( GlobalErrIds.AUDT_BIND_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -584,7 +584,7 @@ final class AuditDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "searchUserMods caught LdapException id=" + e.getMessage();
+ String error = "searchUserMods caught LdapException id=" + e;
throw new FinderException( GlobalErrIds.AUDT_MOD_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -674,7 +674,7 @@ final class AuditDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "searchAdminMods caught LdapException id=" + e.getMessage();
+ String error = "searchAdminMods caught LdapException id=" + e;
throw new FinderException( GlobalErrIds.AUDT_MOD_ADMIN_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6dc2472a/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java
index 275689e..ad75d68 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java
@@ -135,13 +135,13 @@ final class ConfigDAO extends LdapDataProvider
catch ( LdapEntryAlreadyExistsException e )
{
String warning = "create config dn [" + dn + "] caught LdapEntryAlreadyExistsException="
- + e.getMessage() + " msg=" + e.getMessage();
+ + e;
throw new CreateException( GlobalErrIds.FT_CONFIG_ALREADY_EXISTS, warning, e );
}
catch ( LdapException e )
{
String error;
- error = "create config dn [" + dn + "] caught LDAPException=" + e.getMessage();
+ error = "create config dn [" + dn + "] caught LDAPException=" + e;
LOG.error( error, e );
throw new CreateException( GlobalErrIds.FT_CONFIG_CREATE_FAILED, error, e );
}
@@ -219,7 +219,7 @@ final class ConfigDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "updateProperty dn [" + dn + "] caught LDAPException=" + e.getMessage();
+ String error = "updateProperty dn [" + dn + "] caught LDAPException=" + e;
throw new UpdateException( GlobalErrIds.FT_CONFIG_UPDATE_FAILED, error, e );
}
finally
@@ -247,7 +247,7 @@ final class ConfigDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "remove dn [" + dn + "] LDAPException=" + e.getMessage();
+ String error = "remove dn [" + dn + "] LDAPException=" + e;
throw new RemoveException( GlobalErrIds.FT_CONFIG_DELETE_FAILED, error, e );
}
finally
@@ -285,7 +285,7 @@ final class ConfigDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "remove props dn [" + dn + "] caught LDAPException=" + e.getMessage();
+ String error = "remove props dn [" + dn + "] caught LDAPException=" + e;
throw new UpdateException( GlobalErrIds.FT_CONFIG_DELETE_PROPS_FAILED, error, e );
}
finally
@@ -321,7 +321,7 @@ final class ConfigDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "getConfig dn [" + dn + "] caught LdapException=" + e.getMessage();
+ String error = "getConfig dn [" + dn + "] caught LdapException=" + e;
throw new FinderException( GlobalErrIds.FT_CONFIG_READ_FAILED, error, e );
}
finally
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6dc2472a/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java
index 3dea0fe..ab9db7c 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java
@@ -128,7 +128,7 @@ final class GroupDAO extends LdapDataProvider implements PropertyProvider<Group>
}
catch ( LdapException e )
{
- String error = "create group node dn [" + nodeDn + "] caught LDAPException=" + e.getMessage();
+ String error = "create group node dn [" + nodeDn + "] caught LDAPException=" + e;
throw new CreateException( GlobalErrIds.GROUP_ADD_FAILED, error, e );
}
finally
@@ -179,7 +179,7 @@ final class GroupDAO extends LdapDataProvider implements PropertyProvider<Group>
}
catch ( LdapException e )
{
- String error = "update group node dn [" + nodeDn + "] caught LDAPException=" + e.getMessage();
+ String error = "update group node dn [" + nodeDn + "] caught LDAPException=" + e;
throw new UpdateException( GlobalErrIds.GROUP_UPDATE_FAILED, error, e );
}
finally
@@ -206,7 +206,7 @@ final class GroupDAO extends LdapDataProvider implements PropertyProvider<Group>
}
catch ( LdapException e )
{
- String error = "update group property node dn [" + nodeDn + "] caught LDAPException=" + e.getMessage();
+ String error = "update group property node dn [" + nodeDn + "] caught LDAPException=" + e;
throw new CreateException( GlobalErrIds.GROUP_ADD_PROPERTY_FAILED, error, e );
}
finally
@@ -234,7 +234,7 @@ final class GroupDAO extends LdapDataProvider implements PropertyProvider<Group>
}
catch ( LdapException e )
{
- String error = "delete group property node dn [" + nodeDn + "] caught LDAPException=" + e.getMessage();
+ String error = "delete group property node dn [" + nodeDn + "] caught LDAPException=" + e;
throw new RemoveException( GlobalErrIds.GROUP_DELETE_PROPERTY_FAILED, error, e );
}
finally
@@ -264,7 +264,7 @@ final class GroupDAO extends LdapDataProvider implements PropertyProvider<Group>
}
catch ( LdapException e )
{
- String error = "remove group node dn [" + nodeDn + "] caught LDAPException=" + e.getMessage();
+ String error = "remove group node dn [" + nodeDn + "] caught LDAPException=" + e;
throw new RemoveException( GlobalErrIds.GROUP_DELETE_FAILED, error, e );
}
finally
@@ -298,7 +298,7 @@ final class GroupDAO extends LdapDataProvider implements PropertyProvider<Group>
catch ( LdapException e )
{
String error = "assign group name [" + entity.getName() + "] user dn [" + userDn + "] caught " +
- "LDAPException=" + e.getMessage();
+ "LDAPException=" + e;
throw new UpdateException( GlobalErrIds.GROUP_USER_ASSIGN_FAILED, error, e );
}
finally
@@ -334,7 +334,7 @@ final class GroupDAO extends LdapDataProvider implements PropertyProvider<Group>
catch ( LdapException e )
{
String error = "deassign group name [" + entity.getName() + "] user dn [" + userDn + "] caught " +
- "LDAPException=" + e.getMessage();
+ "LDAPException=" + e;
throw new UpdateException( GlobalErrIds.GROUP_USER_DEASSIGN_FAILED, error, e );
}
finally
@@ -376,7 +376,7 @@ final class GroupDAO extends LdapDataProvider implements PropertyProvider<Group>
}
catch ( LdapException e )
{
- String error = "read dn [" + dn + "] LdapException=" + e.getMessage();
+ String error = "read dn [" + dn + "] LdapException=" + e;
throw new FinderException( GlobalErrIds.GROUP_READ_FAILED, error, e );
}
finally
@@ -422,7 +422,7 @@ final class GroupDAO extends LdapDataProvider implements PropertyProvider<Group>
}
catch ( LdapException e )
{
- String error = "find filter [" + filter + "] caught LDAPException=" + e.getMessage();
+ String error = "find filter [" + filter + "] caught LDAPException=" + e;
throw new FinderException( GlobalErrIds.GROUP_SEARCH_FAILED, error, e );
}
finally
@@ -470,7 +470,7 @@ final class GroupDAO extends LdapDataProvider implements PropertyProvider<Group>
}
catch ( LdapException e )
{
- String error = "find filter [" + filter + "] caught LDAPException=" + e.getMessage();
+ String error = "find filter [" + filter + "] caught LDAPException=" + e;
throw new FinderException( GlobalErrIds.GROUP_SEARCH_FAILED, error, e );
}
finally
@@ -518,7 +518,7 @@ final class GroupDAO extends LdapDataProvider implements PropertyProvider<Group>
}
catch ( LdapException e )
{
- String error = "find filter [" + filter + "] caught LDAPException=" + e.getMessage();
+ String error = "find filter [" + filter + "] caught LDAPException=" + e;
throw new FinderException( GlobalErrIds.GROUP_SEARCH_FAILED, error, e );
}
finally
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6dc2472a/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitDAO.java
index 2c2efc8..bf3a265 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitDAO.java
@@ -591,7 +591,7 @@ final class OrgUnitDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "getAllDescendants filter [" + filter + "] caught LdapException="
- + e.getMessage();
+ + e;
throw new FinderException( GlobalErrIds.ARLE_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6dc2472a/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitDAO.java
index 7e53530..019c9a5 100644
--- a/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitDAO.java
@@ -153,7 +153,7 @@ final class OrganizationalUnitDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "remove container node dn [" + nodeDn + "] caught LDAPException="
- + e.getMessage();
+ + e;
throw new RemoveException( GlobalErrIds.CNTR_DELETE_FAILED, error, e );
}
finally
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6dc2472a/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
index f786b5c..6479ef2 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
@@ -300,7 +300,7 @@ class PermDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "createObject perm obj [" + entity.getObjName() + "] caught LdapException="
- + e.getMessage();
+ + e;
throw new CreateException( GlobalErrIds.PERM_ADD_FAILED, error, e );
}
finally
@@ -361,7 +361,7 @@ class PermDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "updateObj objName [" + entity.getObjName() + "] caught LdapException="
- + e.getMessage();
+ + e;
throw new UpdateException( GlobalErrIds.PERM_UPDATE_FAILED, error, e );
}
finally
@@ -391,7 +391,7 @@ class PermDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "deleteObj objName [" + entity.getObjName() + "] caught LdapException="
- + e.getMessage();
+ + e;
throw new RemoveException( GlobalErrIds.PERM_DELETE_FAILED, error, e );
}
catch ( CursorException e )
@@ -478,7 +478,7 @@ class PermDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "createOperation objName [" + entity.getObjName() + "] opName ["
- + entity.getOpName() + "] caught LdapException=" + e.getMessage();
+ + entity.getOpName() + "] caught LdapException=" + e;
throw new CreateException( GlobalErrIds.PERM_ADD_FAILED, error, e );
}
finally
@@ -535,7 +535,7 @@ class PermDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "createPermissionAttributeSet name [" + entity.getName() + "] caught LdapException=" + e.getMessage();
+ String error = "createPermissionAttributeSet name [" + entity.getName() + "] caught LdapException=" + e;
throw new CreateException( GlobalErrIds.PERM_ADD_FAILED, error, e );
}
finally
@@ -622,7 +622,7 @@ class PermDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "createPermissionAttribute name [" + entity.getAttributeName() + "] caught LdapException=" + e.getMessage();
+ String error = "createPermissionAttribute name [" + entity.getAttributeName() + "] caught LdapException=" + e;
throw new CreateException( GlobalErrIds.PERM_ATTR_ADD_FAILED, error, e );
}
finally
@@ -695,7 +695,7 @@ class PermDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "updatePermissionAttribute name [" + entity.getAttributeName() + "] caught LdapException=" + e.getMessage();
+ String error = "updatePermissionAttribute name [" + entity.getAttributeName() + "] caught LdapException=" + e;
throw new UpdateException( GlobalErrIds.PERM_ATTRIBUTE_UPDATE_FAILED, error, e );
}
finally
@@ -765,7 +765,7 @@ class PermDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "updateOperation objName [" + entity.getObjName() + "] opName ["
- + entity.getOpName() + "] caught LdapException=" + e.getMessage();
+ + entity.getOpName() + "] caught LdapException=" + e;
throw new UpdateException( GlobalErrIds.PERM_UPDATE_FAILED, error, e );
}
finally
@@ -796,7 +796,7 @@ class PermDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "deleteOperation objName [" + entity.getObjName() + "] opName ["
- + entity.getOpName() + "] caught LdapException=" + e.getMessage();
+ + entity.getOpName() + "] caught LdapException=" + e;
throw new RemoveException( GlobalErrIds.PERM_DELETE_FAILED, error, e );
}
catch ( CursorException e )
@@ -828,7 +828,7 @@ class PermDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "deleteAttributeSet name [" + entity.getName() + "]"
- + " caught LdapException=" + e.getMessage();
+ + " caught LdapException=" + e;
throw new RemoveException( GlobalErrIds.PERM_ATTRIBUTE_SET_DELETE_FAILED, error, e );
}
catch ( CursorException e )
@@ -860,7 +860,7 @@ class PermDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "deletePermission name [" + entity.getAttributeName() + "] set ["
- + attributeSetName + "] caught LdapException=" + e.getMessage();
+ + attributeSetName + "] caught LdapException=" + e;
throw new RemoveException( GlobalErrIds.PERM_ATTRIBUTE_DELETE_FAILED, error, e );
}
finally
@@ -910,7 +910,7 @@ class PermDAO extends LdapDataProvider
{
String error = "grant perm object [" + pOp.getObjName() + "] operation ["
+ pOp.getOpName() + "] name [" + role.getName() + "] caught LdapException="
- + e.getMessage();
+ + e;
throw new UpdateException( GlobalErrIds.PERM_GRANT_FAILED, error, e );
}
finally
@@ -952,7 +952,7 @@ class PermDAO extends LdapDataProvider
{
String error = "revoke perm object [" + pOp.getObjName() + "] operation ["
+ pOp.getOpName() + "] name [" + role.getName() + "] caught LdapException=" +
- e.getMessage();
+ e;
throw new UpdateException( GlobalErrIds.PERM_REVOKE_FAILED, error, e );
}
finally
@@ -1003,7 +1003,7 @@ class PermDAO extends LdapDataProvider
{
String error = "grant perm object [" + pOp.getObjName() + "] operation ["
+ pOp.getOpName() + "] userId [" + user.getUserId() + "] caught LdapException="
- + e.getMessage();
+ + e;
throw new UpdateException( GlobalErrIds.PERM_GRANT_USER_FAILED, error, e );
}
finally
@@ -1046,7 +1046,7 @@ class PermDAO extends LdapDataProvider
{
String error = "revoke perm object [" + pOp.getObjName() + "] operation ["
+ pOp.getOpName() + "] userId [" + user.getUserId() + "] caught LdapException="
- + e.getMessage();
+ + e;
throw new UpdateException( GlobalErrIds.PERM_REVOKE_FAILED, error, e );
}
finally
@@ -1088,7 +1088,7 @@ class PermDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "getUser [" + dn + "] caught LdapException=" + e.getMessage();
+ String error = "getUser [" + dn + "] caught LdapException=" + e;
throw new FinderException( GlobalErrIds.PERM_READ_OP_FAILED, error, e );
}
finally
@@ -1131,7 +1131,7 @@ class PermDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "getPerm Obj dn [" + dn + "] caught LdapException=" + e.getMessage();
+ String error = "getPerm Obj dn [" + dn + "] caught LdapException=" + e;
throw new FinderException( GlobalErrIds.PERM_READ_OBJ_FAILED, error, e );
}
finally
@@ -1170,7 +1170,7 @@ class PermDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "getPermAttributeSet dn [" + dn + "] caught LdapException=" + e.getMessage();
+ String error = "getPermAttributeSet dn [" + dn + "] caught LdapException=" + e;
throw new FinderException( GlobalErrIds.PERM_ATTRIBUTE_SET_NOT_FOUND, error, e );
}
finally
@@ -1211,7 +1211,7 @@ class PermDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "findPermissionAttributes caught LdapException=" + e.getMessage();
+ String error = "findPermissionAttributes caught LdapException=" + e;
throw new FinderException( GlobalErrIds.PERM_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -1298,7 +1298,7 @@ class PermDAO extends LdapDataProvider
catch ( LdapException e ) {
if (!(e instanceof LdapNoSuchObjectException))
{
- String error = "checkPermission caught LdapException=" + e.getMessage();
+ String error = "checkPermission caught LdapException=" + e;
throw new FinderException(GlobalErrIds.PERM_READ_OP_FAILED, error, e);
}
@@ -1347,7 +1347,7 @@ class PermDAO extends LdapDataProvider
{
if ( !( e instanceof LdapNoSuchObjectException ) )
{
- String error = "addAuthZAudit caught LdapException=" + e.getMessage();
+ String error = "addAuthZAudit caught LdapException=" + e;
throw new FinderException( GlobalErrIds.PERM_COMPARE_OP_FAILED, error, e );
}
}
@@ -1551,7 +1551,7 @@ class PermDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "findPermissions caught LdapException=" + e.getMessage();
+ String error = "findPermissions caught LdapException=" + e;
throw new FinderException( GlobalErrIds.PERM_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -1596,7 +1596,7 @@ class PermDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "findPermissions caught LdapException=" + e.getMessage();
+ String error = "findPermissions caught LdapException=" + e;
throw new FinderException( GlobalErrIds.PERM_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -1663,7 +1663,7 @@ class PermDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "findAnyPermissions caught LdapException=" + e.getMessage();
+ String error = "findAnyPermissions caught LdapException=" + e;
throw new FinderException( GlobalErrIds.PERM_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -1715,7 +1715,7 @@ class PermDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "findPermissions caught LdapException=" + e.getMessage();
+ String error = "findPermissions caught LdapException=" + e;
throw new FinderException( GlobalErrIds.PERM_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -1777,7 +1777,7 @@ class PermDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "findPermissions caught LdapException=" + e.getMessage();
+ String error = "findPermissions caught LdapException=" + e;
throw new FinderException( GlobalErrIds.PERM_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -1877,7 +1877,7 @@ class PermDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "findPermissions caught LdapException=" + e.getMessage();
+ String error = "findPermissions caught LdapException=" + e;
throw new FinderException( GlobalErrIds.PERM_ROLE_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -1944,7 +1944,7 @@ class PermDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "findPermissions user [" + user.getUserId()
- + "] caught LdapException in PermDAO.findPermissions=" + e.getMessage();
+ + "] caught LdapException in PermDAO.findPermissions=" + e;
throw new FinderException( GlobalErrIds.PERM_USER_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -1997,7 +1997,7 @@ class PermDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "findUserPermissions user [" + user.getUserId()
- + "] caught LdapException in PermDAO.findPermissions=" + e.getMessage();
+ + "] caught LdapException in PermDAO.findPermissions=" + e;
throw new FinderException( GlobalErrIds.PERM_USER_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -2076,7 +2076,7 @@ class PermDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "findPermissions user [" + session.getUserId()
- + "] caught LdapException in PermDAO.findPermissions=" + e.getMessage();
+ + "] caught LdapException in PermDAO.findPermissions=" + e;
throw new FinderException( GlobalErrIds.PERM_SESS_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6dc2472a/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java
index ca90a63..610ac1a 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java
@@ -260,7 +260,7 @@ final class PolicyDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "create name [" + entity.getName() + "] caught LdapException=" + e.getMessage();
+ String error = "create name [" + entity.getName() + "] caught LdapException=" + e;
throw new CreateException( GlobalErrIds.PSWD_CREATE_FAILED, error, e );
}
finally
@@ -404,7 +404,7 @@ final class PolicyDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "update name [" + entity.getName() + "] caught LdapException=" + e.getMessage();
+ String error = "update name [" + entity.getName() + "] caught LdapException=" + e;
throw new UpdateException( GlobalErrIds.PSWD_UPDATE_FAILED, error, e );
}
finally
@@ -430,7 +430,7 @@ final class PolicyDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "remove name [" + entity.getName() + "] caught LdapException=" + e.getMessage();
+ String error = "remove name [" + entity.getName() + "] caught LdapException=" + e;
throw new RemoveException( GlobalErrIds.PSWD_DELETE_FAILED, error, e );
}
finally
@@ -466,7 +466,7 @@ final class PolicyDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "getPolicy name [" + policy.getName() + "] caught LdapException="
- + e.getMessage();
+ + e;
throw new FinderException( GlobalErrIds.PSWD_READ_FAILED, error, e );
}
finally
@@ -613,7 +613,7 @@ final class PolicyDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "findPolicy name [" + searchVal + "] caught LdapException=" + e.getMessage();
+ String error = "findPolicy name [" + searchVal + "] caught LdapException=" + e;
throw new FinderException( GlobalErrIds.PSWD_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -656,7 +656,7 @@ final class PolicyDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "getPolicies caught LdapException=" + e.getMessage();
+ String error = "getPolicies caught LdapException=" + e;
throw new FinderException( GlobalErrIds.PSWD_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6dc2472a/src/main/java/org/apache/directory/fortress/core/impl/PropertyDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PropertyDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/PropertyDAO.java
index 1a04209..efbb1f8 100644
--- a/src/main/java/org/apache/directory/fortress/core/impl/PropertyDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PropertyDAO.java
@@ -64,7 +64,7 @@ final class PropertyDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "add entity properties[" + entity.getClass().getSimpleName() + "] caught LDAPException=" + e.getMessage();
+ String error = "add entity properties[" + entity.getClass().getSimpleName() + "] caught LDAPException=" + e;
throw new UpdateException( GlobalErrIds.USER_UPDATE_FAILED, error, e );
}
finally
@@ -132,7 +132,7 @@ final class PropertyDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "delete entity properties[" + entity.getClass().getSimpleName() + "] caught LDAPException=" + e.getMessage();
+ String error = "delete entity properties[" + entity.getClass().getSimpleName() + "] caught LDAPException=" + e;
throw new UpdateException( GlobalErrIds.USER_UPDATE_FAILED, error, e );
}
finally
@@ -172,7 +172,7 @@ final class PropertyDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "get properties [" + entityDn + "]= caught LDAPException=" + e.getMessage();
+ String error = "get properties [" + entityDn + "]= caught LDAPException=" + e;
throw new FinderException( GlobalErrIds.ENTITY_PROPS_LOAD_FAILED, error, e );
}
finally
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6dc2472a/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java
index 4a761f8..ae811fa 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java
@@ -218,7 +218,7 @@ final class RoleDAO extends LdapDataProvider implements PropertyProvider<Role>,
}
catch ( LdapException e )
{
- String error = "create role [" + entity.getName() + "] caught LdapException=" + e.getMessage();
+ String error = "create role [" + entity.getName() + "] caught LdapException=" + e;
throw new CreateException( GlobalErrIds.ROLE_ADD_FAILED, error, e );
}
finally
@@ -278,7 +278,7 @@ final class RoleDAO extends LdapDataProvider implements PropertyProvider<Role>,
}
catch ( LdapException e )
{
- String error = "update name [" + entity.getName() + "] caught LdapException=" + e.getMessage();
+ String error = "update name [" + entity.getName() + "] caught LdapException=" + e;
throw new UpdateException( GlobalErrIds.ROLE_UPDATE_FAILED, error, e );
}
catch ( Exception e )
@@ -294,7 +294,7 @@ final class RoleDAO extends LdapDataProvider implements PropertyProvider<Role>,
}
catch ( Exception e )
{
- String error = "update name [" + entity.getName() + "] caught LdapException=" + e.getMessage();
+ String error = "update name [" + entity.getName() + "] caught LdapException=" + e;
throw new UpdateException( GlobalErrIds.ROLE_UPDATE_FAILED, error, e );
}
}
@@ -322,7 +322,7 @@ final class RoleDAO extends LdapDataProvider implements PropertyProvider<Role>,
}
catch ( LdapException e )
{
- String error = "deleteParent name [" + entity.getName() + "] caught LdapException=" + e.getMessage();
+ String error = "deleteParent name [" + entity.getName() + "] caught LdapException=" + e;
throw new UpdateException( GlobalErrIds.ROLE_REMOVE_PARENT_FAILED, error, e );
}
finally
@@ -355,7 +355,7 @@ final class RoleDAO extends LdapDataProvider implements PropertyProvider<Role>,
catch ( LdapException e )
{
String error = "assign role name [" + entity.getName() + "] user dn [" + userDn + "] caught LdapException="
- + e.getMessage();
+ + e;
throw new UpdateException( GlobalErrIds.ROLE_USER_ASSIGN_FAILED, error, e );
}
finally
@@ -389,7 +389,7 @@ final class RoleDAO extends LdapDataProvider implements PropertyProvider<Role>,
catch ( LdapException e )
{
String error = "deassign role name [" + entity.getName() + "] user dn [" + userDn
- + "] caught LdapException=" + e.getMessage();
+ + "] caught LdapException=" + e;
throw new UpdateException( GlobalErrIds.ROLE_USER_DEASSIGN_FAILED, error, e );
}
finally
@@ -418,7 +418,7 @@ final class RoleDAO extends LdapDataProvider implements PropertyProvider<Role>,
}
catch ( LdapException e )
{
- String error = "remove role name=" + role.getName() + " LdapException=" + e.getMessage();
+ String error = "remove role name=" + role.getName() + " LdapException=" + e;
throw new RemoveException( GlobalErrIds.ROLE_DELETE_FAILED, error, e );
}
finally
@@ -505,7 +505,7 @@ final class RoleDAO extends LdapDataProvider implements PropertyProvider<Role>,
}
catch ( LdapException e )
{
- String error = "findRoles filter [" + filter + "] caught LdapException=" + e.getMessage();
+ String error = "findRoles filter [" + filter + "] caught LdapException=" + e;
throw new FinderException( GlobalErrIds.ROLE_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -576,7 +576,7 @@ final class RoleDAO extends LdapDataProvider implements PropertyProvider<Role>,
}
catch ( LdapException e )
{
- String error = "groupRoles filter [" + filterbuf.toString() + "] caught LdapException=" + e.getMessage();
+ String error = "groupRoles filter [" + filterbuf.toString() + "] caught LdapException=" + e;
throw new FinderException( GlobalErrIds.ROLE_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -625,7 +625,7 @@ final class RoleDAO extends LdapDataProvider implements PropertyProvider<Role>,
}
catch ( LdapException e )
{
- String error = "findRoles filter [" + filter + "] caught LdapException=" + e.getMessage();
+ String error = "findRoles filter [" + filter + "] caught LdapException=" + e;
throw new FinderException( GlobalErrIds.ROLE_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -671,7 +671,7 @@ final class RoleDAO extends LdapDataProvider implements PropertyProvider<Role>,
}
catch ( LdapException e )
{
- String error = "findAssignedRoles userDn [" + userDn + "] caught LdapException=" + e.getMessage();
+ String error = "findAssignedRoles userDn [" + userDn + "] caught LdapException=" + e;
throw new FinderException( GlobalErrIds.ROLE_OCCUPANT_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
@@ -720,7 +720,7 @@ final class RoleDAO extends LdapDataProvider implements PropertyProvider<Role>,
}
catch ( LdapException e )
{
- String error = "getAllDescendants filter [" + filter + "] caught LdapException=" + e.getMessage();
+ String error = "getAllDescendants filter [" + filter + "] caught LdapException=" + e;
throw new FinderException( GlobalErrIds.ROLE_SEARCH_FAILED, error, e );
}
catch ( CursorException e )
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6dc2472a/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java
index 34c77af..243ad5d 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java
@@ -178,7 +178,7 @@ final class SdDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "create SD set name [" + entity.getName() + "] type [" + entity.getType()
- + "] caught LdapException=" + e.getMessage();
+ + "] caught LdapException=" + e;
int errCode;
if ( entity.getType() == SDSet.SDType.DYNAMIC )
{
@@ -236,7 +236,7 @@ final class SdDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "update name [" + entity.getName() + "] type [" + entity.getType()
- + "] caught LdapException=" + e.getMessage();
+ + "] caught LdapException=" + e;
int errCode;
if ( entity.getType() == SDSet.SDType.DYNAMIC )
{
@@ -275,7 +275,7 @@ final class SdDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "remove SD name=" + entity.getName() + " type [" + entity.getType() + "] LdapException="
- + e.getMessage();
+ + e;
int errCode;
if ( entity.getType() == SDSet.SDType.DYNAMIC )
{
@@ -384,7 +384,7 @@ final class SdDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "search sdset name [" + sdset.getName() + "] type [" + sdset.getType()
- + "] caught LdapException=" + e.getMessage();
+ + "] caught LdapException=" + e;
int errCode;
if ( sdset.getType() == SDSet.SDType.DYNAMIC )
@@ -491,7 +491,7 @@ final class SdDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "search role [" + role.getName() + "] type [" + type + "] caught LdapException="
- + e.getMessage();
+ + e;
int errCode;
if ( type == SDSet.SDType.DYNAMIC )
@@ -580,7 +580,7 @@ final class SdDAO extends LdapDataProvider
}
catch ( LdapException e )
{
- String error = "search type [" + sdSet.getType() + "] caught LdapException=" + e.getMessage();
+ String error = "search type [" + sdSet.getType() + "] caught LdapException=" + e;
int errCode;
if ( sdSet.getType() == SDSet.SDType.DYNAMIC )
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6dc2472a/src/main/java/org/apache/directory/fortress/core/impl/SuffixDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/SuffixDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/SuffixDAO.java
index 2391bd5..fe9acde 100644
--- a/src/main/java/org/apache/directory/fortress/core/impl/SuffixDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/SuffixDAO.java
@@ -97,7 +97,7 @@ final class SuffixDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "create container node dn [" + nodeDn + "] caught LDAPException="
- + e.getMessage();
+ + e;
throw new CreateException( GlobalErrIds.SUFX_CREATE_FAILED, error, e );
}
finally
@@ -138,7 +138,7 @@ final class SuffixDAO extends LdapDataProvider
catch ( LdapException e )
{
String error = "remove suffix node dn [" + nodeDn + "] caught LDAPException="
- + e.getMessage();
+ + e;
throw new RemoveException( GlobalErrIds.SUFX_DELETE_FAILED, error, e );
}
finally
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6dc2472a/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
----------------------------------------------------------------------
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 ae1dcd6..c54448f 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
@@ -398,7 +398,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
}
catch ( LdapException e )
{
- String error = "create userId [" + entity.getUserId() + "] caught LDAPException=" + e.getMessage();
+ String error = "create userId [" + entity.getUserId() + "] caught LDAPException=" + e;
throw new CreateException( GlobalErrIds.USER_ADD_FAILED, error, e );
}
finally
@@ -544,7 +544,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
}
catch ( LdapException e )
{
- String error = "update userId [" + entity.getUserId() + "] caught LDAPException=" + e.getMessage();
+ String error = "update userId [" + entity.getUserId() + "] caught LDAPException=" + e;
throw new UpdateException( GlobalErrIds.USER_UPDATE_FAILED, error, e );
}
finally
@@ -588,7 +588,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
catch ( LdapException e )
{
String error = "updateProps userId [" + entity.getUserId() + "] isReplace [" + replace + "] caught " +
- "LDAPException=" + e.getMessage();
+ "LDAPException=" + e;
throw new UpdateException( GlobalErrIds.USER_UPDATE_FAILED, error, e );
}
finally
@@ -616,7 +616,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
}
catch ( LdapException e )
{
- String error = "remove userId [" + user.getUserId() + "] caught LDAPException=" + e.getMessage();
+ String error = "remove userId [" + user.getUserId() + "] caught LDAPException=" + e;
throw new RemoveException( GlobalErrIds.USER_DELETE_FAILED, error, e );
}
finally
@@ -647,7 +647,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
}
catch ( LdapException e )
{
- String error = "lock user [" + user.getUserId() + "] caught LDAPException=" + e.getMessage();
+ String error = "lock user [" + user.getUserId() + "] caught LDAPException=" + e;
throw new UpdateException( GlobalErrIds.USER_PW_LOCK_FAILED, error, e );
}
finally
@@ -681,7 +681,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
}
catch ( LdapException e )
{
- String error = "unlock user [" + user.getUserId() + "] caught LDAPException= " + e.getMessage();
+ String error = "unlock user [" + user.getUserId() + "] caught LDAPException= " + e;
throw new UpdateException( GlobalErrIds.USER_PW_UNLOCK_FAILED, error, e );
}
finally
@@ -731,7 +731,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
}
catch ( LdapException e )
{
- String error = "getUser [" + userDn + "]= caught LDAPException=" + e.getMessage();
+ String error = "getUser [" + userDn + "]= caught LDAPException=" + e;
throw new FinderException( GlobalErrIds.USER_READ_FAILED, error, e );
}
finally
@@ -786,7 +786,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
}
catch ( LdapException e )
{
- String error = "getUserAdminRoles [" + userDn + "]= caught LDAPException=" + e.getMessage();
+ String error = "getUserAdminRoles [" + userDn + "]= caught LDAPException=" + e;
throw new FinderException( GlobalErrIds.USER_READ_FAILED, error, e );
}
finally
@@ -830,7 +830,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
}
catch ( LdapException e )
{
- String error = "getRoles [" + userDn + "]= caught LDAPException=" + e.getMessage();
+ String error = "getRoles [" + userDn + "]= caught LDAPException=" + e;
throw new FinderException( GlobalErrIds.URLE_SEARCH_FAILED, error, e );
}
finally
@@ -895,7 +895,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
}
catch ( LdapException e )
{
- String error = "checkPassword userId [" + user.getUserId() + "] caught LDAPException=" + e.getMessage();
+ String error = "checkPassword userId [" + user.getUserId() + "] caught LDAPException=" + e;
throw new FinderException( GlobalErrIds.USER_READ_FAILED, error, e );
}
finally
@@ -1077,7 +1077,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
}
catch ( LdapException e )
{
- String warning = "findUsers userRoot [" + userRoot + "] caught LDAPException=" + e.getMessage();
+ String warning = "findUsers userRoot [" + userRoot + "] caught LDAPException=" + e;
throw new FinderException( GlobalErrIds.USER_SEARCH_FAILED, warning, e );
}
catch ( CursorException e )
@@ -1130,7 +1130,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
}
catch ( LdapException e )
{
- String warning = "findUsers caught LdapException=" + e.getMessage();
+ String warning = "findUsers caught LdapException=" + e;
throw new FinderException( GlobalErrIds.USER_SEARCH_FAILED, warning, e );
}
catch ( CursorException e )
@@ -1466,7 +1466,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
}
catch ( LdapException e )
{
- String warning = "getAssignedUsers caught LDAPException=" + e.getMessage();
+ String warning = "getAssignedUsers caught LDAPException=" + e;
throw new FinderException( GlobalErrIds.URLE_SEARCH_FAILED, warning, e );
}
catch ( CursorException e )
@@ -1627,7 +1627,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
}
catch ( LdapException e )
{
- String warning = "findUsersList caught LDAPException=" + e.getMessage();
+ String warning = "findUsersList caught LDAPException=" + e;
throw new FinderException( GlobalErrIds.USER_SEARCH_FAILED, warning, e );
}
catch ( CursorException e )
@@ -1689,7 +1689,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
}
catch ( LdapException e )
{
- String warning = "findUsers caught LDAPException=" + e.getMessage();
+ String warning = "findUsers caught LDAPException=" + e;
throw new FinderException( GlobalErrIds.USER_SEARCH_FAILED, warning, e );
}
catch ( CursorException e )
@@ -1745,7 +1745,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
{
String warning = User.class.getName() + ".changePassword user [" + entity.getUserId() + "] ";
- warning += " constraint violation, ldap rc=" + e.getMessage() + " Fortress rc=" + GlobalErrIds
+ warning += " constraint violation, ldap rc=" + e + " Fortress rc=" + GlobalErrIds
.PSWD_CONST_VIOLATION;
throw new PasswordException( GlobalErrIds.PSWD_CONST_VIOLATION, warning );
@@ -1753,14 +1753,14 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
catch ( LdapNoPermissionException e )
{
String warning = User.class.getName() + ".changePassword user [" + entity.getUserId() + "] ";
- warning += " user not authorized to change password, ldap rc=" + e.getMessage() + " Fortress rc=" +
+ warning += " user not authorized to change password, ldap rc=" + e + " Fortress rc=" +
GlobalErrIds.USER_PW_MOD_NOT_ALLOWED;
throw new UpdateException( GlobalErrIds.USER_PW_MOD_NOT_ALLOWED, warning );
}
catch ( LdapException e )
{
String warning = User.class.getName() + ".changePassword user [" + entity.getUserId() + "] ";
- warning += " caught LDAPException rc=" + e.getMessage();
+ warning += " caught LDAPException rc=" + e;
throw new UpdateException( GlobalErrIds.USER_PW_CHANGE_FAILED, warning, e );
}
finally
@@ -1882,7 +1882,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
{
String warning = "assign userId [" + uRole.getUserId() + "] name [" + uRole.getName() + "] ";
- warning += "caught LDAPException=" + e.getMessage();
+ warning += "caught LDAPException=" + e;
throw new UpdateException( GlobalErrIds.URLE_ASSIGN_FAILED, warning, e );
}
finally
@@ -1922,7 +1922,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
{
String warning = "assign userId [" + uRole.getUserId() + "] role constraint [" + szRoleConstraint + "] ";
- warning += "caught LDAPException=" + e.getMessage();
+ warning += "caught LDAPException=" + e;
throw new UpdateException( GlobalErrIds.URLE_ASSIGN_FAILED, warning, e );
}
finally
@@ -1958,7 +1958,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
{
String warning = "deassign userId [" + uRole.getUserId() + "] role constraint [" + szRoleConstraint + "] ";
- warning += "caught LDAPException=" + e.getMessage();
+ warning += "caught LDAPException=" + e;
throw new UpdateException( GlobalErrIds.URLE_ASSIGN_FAILED, warning, e );
}
finally
@@ -2025,7 +2025,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
catch ( LdapException e )
{
String warning = "deassign userId [" + uRole.getUserId() + "] name [" + uRole.getName() + "] caught " +
- "LDAPException=" + e.getMessage();
+ "LDAPException=" + e;
throw new UpdateException( GlobalErrIds.URLE_DEASSIGN_FAILED, warning, e );
}
finally
@@ -2070,7 +2070,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
catch ( LdapException e )
{
String warning = "assign userId [" + uRole.getUserId() + "] name [" + uRole.getName() + "] caught " +
- "LDAPException=" + e.getMessage();
+ "LDAPException=" + e;
throw new UpdateException( GlobalErrIds.ARLE_ASSIGN_FAILED, warning, e );
}
finally
@@ -2139,7 +2139,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
catch ( LdapException e )
{
String warning = "deassign userId [" + uRole.getUserId() + "] name [" + uRole.getName() + "] caught " +
- "LDAPException=" + e.getMessage();
+ "LDAPException=" + e;
throw new UpdateException( GlobalErrIds.ARLE_DEASSIGN_FAILED, warning, e );
}
finally
@@ -2172,7 +2172,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
}
catch ( LdapException e )
{
- String warning = "deletePwPolicy userId [" + user.getUserId() + "] caught LDAPException=" + e.getMessage() + " msg=" + e.getMessage();
+ String warning = "deletePwPolicy userId [" + user.getUserId() + "] caught LDAPException=" + e + " msg=" + e;
throw new UpdateException( GlobalErrIds.USER_PW_PLCY_DEL_FAILED, warning, e );
}
finally
@@ -2290,7 +2290,7 @@ final class UserDAO extends LdapDataProvider implements PropUpdater
}
catch ( LdapException e )
{
- String error = "getUserRoles [" + userDn + "]= caught LDAPException=" + e.getMessage();
+ String error = "getUserRoles [" + userDn + "]= caught LDAPException=" + e;
throw new FinderException( GlobalErrIds.USER_READ_FAILED, error, e );
}
finally
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6dc2472a/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java b/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
index 046c18b..5aff0b5 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
@@ -266,7 +266,7 @@ public class LdapConnectionProvider
}
catch ( Exception e )
{
- throw new RuntimeException( e.getMessage(), e );
+ throw new RuntimeException( e );
}
}
@@ -284,7 +284,7 @@ public class LdapConnectionProvider
}
catch ( Exception e )
{
- throw new RuntimeException( e.getMessage(), e );
+ throw new RuntimeException( e );
}
}
@@ -302,7 +302,7 @@ public class LdapConnectionProvider
}
catch ( Exception e )
{
- throw new RuntimeException( e.getMessage(), e );
+ throw new RuntimeException( e );
}
}
@@ -321,7 +321,7 @@ public class LdapConnectionProvider
}
catch ( Exception e )
{
- throw new LdapException( e.getMessage(), e );
+ throw new LdapException( e );
}
}
@@ -340,7 +340,7 @@ public class LdapConnectionProvider
}
catch ( Exception e )
{
- throw new LdapException( e.getMessage(), e );
+ throw new LdapException( e );
}
}
@@ -359,7 +359,7 @@ public class LdapConnectionProvider
}
catch ( Exception e )
{
- throw new LdapException( e.getMessage(), e );
+ throw new LdapException( e );
}
}
@@ -375,7 +375,7 @@ public class LdapConnectionProvider
}
catch ( Exception e )
{
- LOG.warn( "Error closing admin pool: " + e.getMessage() );
+ LOG.warn( "Error closing admin pool: " + e );
}
try
@@ -385,7 +385,7 @@ public class LdapConnectionProvider
}
catch ( Exception e )
{
- LOG.warn( "Error closing user pool: " + e.getMessage() );
+ LOG.warn( "Error closing user pool: " + e );
}
try
@@ -395,7 +395,7 @@ public class LdapConnectionProvider
}
catch ( Exception e )
{
- LOG.warn( "Error closing log pool: " + e.getMessage() );
+ LOG.warn( "Error closing log pool: " + e );
}
}
}