[jboss-jira] [JBoss JIRA] (WFCORE-4559) Incorrectly formatted result produced by LocalPatchOperationTarget.info(stream)

[Oleksiy Lubyanskyy (Jira)]

     [ https://issues.jboss.org/browse/WFCORE-4559?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Oleksiy Lubyanskyy updated WFCORE-4559:
---------------------------------------
    Description: 
Addon patches are added to the wrong instance of ModelNode which breaks the CLI `patch info --verbose`. Here is how it should be fixed
{code:java}
diff --git a/patching/src/main/java/org/jboss/as/patching/tool/PatchOperationTarget.java b/patching/src/main/java/org/jboss/as/patching/tool/PatchOperationTarget.java
index e739c73847..4901ccc25d 100644
--- a/patching/src/main/java/org/jboss/as/patching/tool/PatchOperationTarget.java
+++ b/patching/src/main/java/org/jboss/as/patching/tool/PatchOperationTarget.java
@@ -183,9 +183,10 @@ public abstract class PatchOperationTarget {
                     }
                 }
                 if(vInfo.hasAddOns()) {
-                    final ModelNode layerNode = result.get(Constants.ADD_ON);
+                    final ModelNode layersNode = result.get(Constants.ADD_ON);
                     for(String name : vInfo.getAddOnNames()) {
                         final TargetInfo layerInfo = vInfo.getAddOnInfo(name);
+                        final ModelNode layerNode = layersNode.get(name);
                         layerNode.get(Constants.CUMULATIVE).set(layerInfo.getCumulativePatchID());
                         final ModelNode patchesNode = layerNode.get(Constants.PATCHES).setEmptyList();
                         if(!layerInfo.getPatchIDs().isEmpty()) {
{code}


  was:
Addon patches are added to the wrong instance of ModelNode which breaks the CLI `patch info --verbose`. Here is how it should be fixed
{code:java}
diff --git a/patching/src/main/java/org/jboss/as/patching/tool/PatchOperationTarget.java b/patching/src/main/java/org/jboss/as/patching/tool/PatchOperationTarget.java
index e739c73847..4901ccc25d 100644
--- a/patching/src/main/java/org/jboss/as/patching/tool/PatchOperationTarget.java
+++ b/patching/src/main/java/org/jboss/as/patching/tool/PatchOperationTarget.java
@@ -183,9 +183,10 @@ public abstract class PatchOperationTarget {
                     }
                 }
                 if(vInfo.hasAddOns()) {
-                    final ModelNode layerNode = result.get(Constants.ADD_ON);
+                    final ModelNode layersNode = result.get(Constants.ADD_ON);
                     for(String name : vInfo.getAddOnNames()) {
                         final TargetInfo layerInfo = vInfo.getAddOnInfo(name);
+                        final ModelNode layerNode = layersNode.get(name);
                         layerNode.get(name, Constants.CUMULATIVE).set(layerInfo.getCumulativePatchID());
                         final ModelNode patchesNode = layerNode.get(Constants.PATCHES).setEmptyList();
                         if(!layerInfo.getPatchIDs().isEmpty()) {
{code}




> Incorrectly formatted result produced by LocalPatchOperationTarget.info(stream)
> -------------------------------------------------------------------------------
>
>                 Key: WFCORE-4559
>                 URL: https://issues.jboss.org/browse/WFCORE-4559
>             Project: WildFly Core
>          Issue Type: Bug
>          Components: Patching 
>    Affects Versions: 10.0.0.Beta1
>            Reporter: Oleksiy Lubyanskyy
>            Assignee: Oleksiy Lubyanskyy
>            Priority: Major
>
> Addon patches are added to the wrong instance of ModelNode which breaks the CLI `patch info --verbose`. Here is how it should be fixed
> {code:java}
> diff --git a/patching/src/main/java/org/jboss/as/patching/tool/PatchOperationTarget.java b/patching/src/main/java/org/jboss/as/patching/tool/PatchOperationTarget.java
> index e739c73847..4901ccc25d 100644
> --- a/patching/src/main/java/org/jboss/as/patching/tool/PatchOperationTarget.java
> +++ b/patching/src/main/java/org/jboss/as/patching/tool/PatchOperationTarget.java
> @@ -183,9 +183,10 @@ public abstract class PatchOperationTarget {
>                      }
>                  }
>                  if(vInfo.hasAddOns()) {
> -                    final ModelNode layerNode = result.get(Constants.ADD_ON);
> +                    final ModelNode layersNode = result.get(Constants.ADD_ON);
>                      for(String name : vInfo.getAddOnNames()) {
>                          final TargetInfo layerInfo = vInfo.getAddOnInfo(name);
> +                        final ModelNode layerNode = layersNode.get(name);
>                          layerNode.get(Constants.CUMULATIVE).set(layerInfo.getCumulativePatchID());
>                          final ModelNode patchesNode = layerNode.get(Constants.PATCHES).setEmptyList();
>                          if(!layerInfo.getPatchIDs().isEmpty()) {
> {code}



--
This message was sent by Atlassian Jira
(v7.12.1#712002)