Fix of bugzilla bug #533979 provided by John Dennis.

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

1 files changed, 7 insertions, 7 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java b/pki/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java
index 404a71971..e4499d99d 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java
@@ -49,13 +49,13 @@ public class GenUnexpectedErrorTemplateFiller implements ICMSTemplateFiller {
         IArgBlock fixed = CMS.createArgBlock();
         CMSTemplateParams params = new CMSTemplateParams(null, fixed);
 		
-        // request status if any.
-        if (cmsReq != null) {
-            Integer sts = cmsReq.getStatus();
-
-            if (sts != null) 
-                fixed.set(ICMSTemplateFiller.REQUEST_STATUS, sts.toString());
-        }
+        // When an exception occurs the exit is non-local which probably
+        // will leave the requestStatus value set to something other
+        // than CMSRequest.EXCEPTION, so force the requestStatus to 
+        // EXCEPTION since it must be that if we're here. 
+        Integer sts = CMSRequest.EXCEPTION;
+        if (cmsReq != null) cmsReq.setStatus(sts);
+        fixed.set(ICMSTemplateFiller.REQUEST_STATUS, sts.toString());
 
         // the unexpected error (exception)
         if (e == null)