482733 - support xmlOutput param in profiles; missing request number in XML response to submitted request

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@200 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

1 files changed, 9 insertions, 2 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java b/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
index 0c1cf2f97..0ef2ee5d2 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
@@ -2073,16 +2073,23 @@ public abstract class CMSServlet extends HttpServlet {
     }
 
     protected void outputError(HttpServletResponse httpResp, String errorString) {
-        outputError(httpResp, FAILURE, errorString);
+        outputError(httpResp, FAILURE, errorString, null);
     }
 
-    protected void outputError(HttpServletResponse httpResp, String status, String errorString) {
+    protected void outputError(HttpServletResponse httpResp, String errorString, String requestId) {
+        outputError(httpResp, FAILURE, errorString, null);
+    }
+
+    protected void outputError(HttpServletResponse httpResp, String status, String errorString, String requestId) {
         XMLObject xmlObj = null;
         try {
             xmlObj = new XMLObject();
             Node root = xmlObj.createRoot("XMLResponse");
             xmlObj.addItemToContainer(root, "Status", status);
             xmlObj.addItemToContainer(root, "Error", errorString);
+            if (requestId != null) {
+                xmlObj.addItemToContainer(root, "RequestId", requestId);
+            }
             byte[] cb = xmlObj.toByteArray();
 
             OutputStream os = httpResp.getOutputStream();