Bugzilla Bug 651916 - kra and ocsp are using incorrect ports to talk to CA and complete configuration in DonePanel

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

1 files changed, 3 insertions, 5 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
index 814951e8e..f21a56de9 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
@@ -714,7 +714,7 @@ public class DonePanel extends WizardPanelBase {
         int port = -1;
         try {
             host = cs.getString("preop.ca.hostname", "");
-            port = cs.getInteger("preop.ca.httpsport", -1);
+            port = cs.getInteger("preop.ca.httpsadminport", -1);
         } catch (Exception e) {
         }
 
@@ -738,16 +738,14 @@ public class DonePanel extends WizardPanelBase {
       throws IOException {
         IConfigStore cs = CMS.getConfigStore();
         int port = -1;
-        URL urlx = null;
         String url = "";
         String host = null;
         String transportCert = "";
         try {
             url = cs.getString("preop.ca.url", "");
             if (!url.equals("")) {
-              urlx = new URL(url);
-              host = urlx.getHost();
-              port = urlx.getPort();
+              host = cs.getString("preop.ca.hostname", "");
+              port = cs.getInteger("preop.ca.httpsadminport", -1);
               transportCert = cs.getString("kra.transport.cert", "");
             }
         } catch (Exception e) {