diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2013-01-11 10:30:29 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2013-01-11 10:40:48 -0500 |
commit | 2e3b338baa2520be49c8623b1fec45d4ae1f1277 (patch) | |
tree | 14bbd0d3183d1113c97213762315b78a116adc5c /base/common/src/com/netscape/cms | |
parent | 8b19cbcb034c63c9f427932f002b2c1043afbe21 (diff) | |
download | pki-ticket-214.tar.gz pki-ticket-214.tar.xz pki-ticket-214.zip |
WIPticket-214
Diffstat (limited to 'base/common/src/com/netscape/cms')
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/admin/UserService.java | 5 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java | 3 |
2 files changed, 4 insertions, 4 deletions
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 9a54802ef..e0c7ca9f9 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.LDAPExceptionUtil; import com.netscape.certsrv.logging.IAuditor; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.password.IPasswordCheck; @@ -303,11 +304,11 @@ public class UserService extends PKIService implements UserResource { } 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 LDAPExceptionUtil.createPKIException(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) { diff --git a/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java index 506d608cd..2cd337123 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java @@ -897,8 +897,7 @@ public class UsrGrpAdminServlet extends AdminServlet { CMS.getUserMessage(getLocale(req), "CMS_USRGRP_USER_ADD_FAILED_1", "uid"), null, resp); } else { sendResponse(ERROR, - CMS.getUserMessage(getLocale(req), "CMS_USRGRP_USER_ADD_FAILED_2", user.getUserID()), null, - resp); + CMS.getUserMessage(getLocale(req), "CMS_USRGRP_USER_ADD_FAILED"), null, resp); } return; } catch (LDAPException e) { |