Attachment 582186 Details for Bug 818751 – bug818751.patch

[patch] bug818751.patch

bug818751.patch (text/plain), 2.44 KB, created by John Mazzitelli on 2012-05-04 18:43:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Mazzitelli

Created: 2012-05-04 18:43:32 UTC

Size: 2.44 KB

patch

obsolete

>diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentConfigStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentConfigStep.java
>index 42d1c70..7fc0363 100644
>--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentConfigStep.java
>+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentConfigStep.java
>@@ -21,6 +21,7 @@ package org.rhq.enterprise.gui.coregui.client.bundle.deploy;
> import com.smartgwt.client.widgets.Canvas;
> import com.smartgwt.client.widgets.layout.VLayout;
> 
>+import org.rhq.core.domain.bundle.BundleDeployment;
> import org.rhq.core.domain.configuration.Configuration;
> import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
> import org.rhq.core.domain.configuration.definition.ConfigurationTemplate;
>@@ -64,7 +65,22 @@ public class GetDeploymentConfigStep extends AbstractWizardStep {
>             } else {
>                 // otherwise, pop up the config editor to get the needed config
>                 Configuration startingConfig;
>-                if (wizard.getLiveDeployment() == null) {
>+                BundleDeployment liveDeployment = wizard.getLiveDeployment();
>+                boolean useLiveConfig = false;
>+
>+                if (liveDeployment != null) {
>+                    // If we have a live deployment but it didn't have configuration before
>+                    // then make sure we don't start with a completely empty config.
>+                    // In that case, we need to ask for the config from the default template.
>+                    // But if our live deployment DID have a previous non-empty config, we'll use it
>+                    // to allow the user to see the previous config values used in the live deployment.
>+                    Configuration liveConfig = liveDeployment.getConfiguration();
>+                    if (liveConfig != null) {
>+                        useLiveConfig = !liveConfig.getMap().isEmpty();
>+                    }
>+                }
>+
>+                if (useLiveConfig == false) {
>                     ConfigurationTemplate defaultTemplate = configDef.getDefaultTemplate();
>                     startingConfig = (defaultTemplate != null) ? defaultTemplate.createConfiguration() :
>                             new Configuration();

Actions: View | Diff

Attachments on bug 818751: 581959 | 581960 | 582186