Branch: refs/heads/release/jon3.3.x Home: https://github.com/rhq-project/rhq Commit: 20f245495c82a968606192310beedd68972ce9b5 https://github.com/rhq-project/rhq/commit/20f245495c82a968606192310beedd6897... Author: Lukas Krejci lkrejci@redhat.com Date: 2014-09-23 (Tue, 23 Sep 2014)

Changed paths: M modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/ResourceUpgradeCallbackImpl.java

Log Message: ----------- [BZ 1136998] Fix the logic in the upgrade delegate.

It now better distinguishes between configuration values coming from a previous upgrade report in the chain versus the values coming from the existing resource.

Being aware of the distinction is needed for a correct decision on what value should the "supportsPatching" attribute set to.

(cherry picked from commit 1759352ee3ca4f184872aa55d9530d54a12c42df)