Fixed session.

1 files changed, 7 insertions, 6 deletions

diff --git a/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java b/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java
index 2b8e109a0..aa20e76c2 100644
--- a/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java
+++ b/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java
@@ -119,6 +119,11 @@ public class SystemConfigService extends PKIService implements SystemConfigResou
 
         try {
             ConfigurationResponse response = new ConfigurationResponse();
+
+            HttpSession session = servletRequest.getSession(true);
+            session.setAttribute("configuration_request", request);
+            session.setAttribute("configuration_response", response);
+
             configure(request, response);
             return response;
 
@@ -224,18 +229,14 @@ public class SystemConfigService extends PKIService implements SystemConfigResou
         CMS.debug("=== Finalization ===");
         setupSecurityDomain(data);
         setupDBUser(data);
-
-        HttpSession session = servletRequest.getSession(true);
-        session.setAttribute("request", data);
-        session.setAttribute("response", response);
     }
 
     @Override
     public ConfigurationResponse finalizeConfiguration() {
 
         HttpSession session = servletRequest.getSession();
-        ConfigurationRequest request = (ConfigurationRequest)session.getAttribute("request");
-        ConfigurationResponse response = (ConfigurationResponse)session.getAttribute("response");
+        ConfigurationRequest request = (ConfigurationRequest)session.getAttribute("configuration_request");
+        ConfigurationResponse response = (ConfigurationResponse)session.getAttribute("configuration_response");
 
         finalizeConfiguration(request, response);