[BZ 1180324] Display the correct org.rhq.discoveryDelay value in the …

…UI on the first deployment

(cherry picked from commit c3e31d5)
Signed-off-by: Libor Zoubek <lzoubek@redhat.com>

modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/bundle/deploy/GetDeploymentInfoStep.java

@@ -142,17 +142,19 @@ private String getDiscoveryDelayConfigurationValue() {
         // If user wanted to override the value in recipe, allow it
         Property discoveryDelayProperty = wizard.getNewDeploymentConfig().get("org.rhq.discoveryDelay");
 
-        if(discoveryDelayProperty == null) {
+        if (discoveryDelayProperty == null) {
             // If there was no recipe value, assume the current value is the default one and check live-deployment
             BundleDeployment liveDeployment = wizard.getLiveDeployment();
 
             // If previous deployment had modified deploymentDelay, use it
-            if(liveDeployment != null) {
+            if (liveDeployment != null) {
                 Integer previousDeploymentDelay = liveDeployment.getDiscoveryDelay();
-                if(previousDeploymentDelay != null) {
+                if (previousDeploymentDelay != null) {
                     rValue = previousDeploymentDelay;
                 }
             }
+        } else {
+            rValue = ((PropertySimple) discoveryDelayProperty).getIntegerValue();
         }
 
         wizard.getNewDeploymentConfig().setSimpleValue("org.rhq.discoveryDelay", rValue.toString());