From 98037df00124e1ab81b6ef3be9ba2133f723a95e Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Fri, 11 Jan 2013 10:51:46 -0500 Subject: Added LDAP exception converter. A utility class has been added to convert LDAP exceptions into PKI exceptions. Ticket #191, #214 --- base/common/src/com/netscape/cms/servlet/admin/UserService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'base/common/src/com/netscape/cms/servlet/admin/UserService.java') diff --git a/base/common/src/com/netscape/cms/servlet/admin/UserService.java b/base/common/src/com/netscape/cms/servlet/admin/UserService.java index 4813d10be..901d3891c 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/UserService.java +++ b/base/common/src/com/netscape/cms/servlet/admin/UserService.java @@ -40,6 +40,7 @@ import com.netscape.certsrv.base.PKIException; import com.netscape.certsrv.base.UserNotFoundException; import com.netscape.certsrv.common.OpDef; import com.netscape.certsrv.common.ScopeDef; +import com.netscape.certsrv.ldap.LDAPExceptionConverter; import com.netscape.certsrv.logging.IAuditor; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.password.IPasswordCheck; @@ -298,16 +299,16 @@ public class UserService extends PKIService implements UserResource { if (user.getUserID() == null) { throw new BadRequestDataException(getUserMessage("CMS_USRGRP_USER_ADD_FAILED_1", "uid")); } else { - throw new PKIException(getUserMessage("CMS_USRGRP_USER_ADD_FAILED")); + throw new PKIException(e.getMessage(), e); } } catch (LDAPException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("ADMIN_SRVLT_ADD_USER_FAIL", e.toString())); - throw new PKIException(getUserMessage("CMS_USRGRP_USER_ADD_FAILED")); + throw LDAPExceptionConverter.toPKIException(e); } catch (Exception e) { log(ILogger.LL_FAILURE, e.toString()); - throw new PKIException(getUserMessage("CMS_USRGRP_USER_ADD_FAILED")); + throw new PKIException(e.getMessage(), e); } } catch (PKIException e) { -- cgit