From a9e02d766f928b19e87f24f8a48b3c8a568f5f16 Mon Sep 17 00:00:00 2001
From: Pedro Ruivo <pruivo@redhat.com>
Date: Thu, 16 May 2019 14:27:49 +0100
Subject: [PATCH] Fix add-ons root path

* add-ons root path is pointing to system/layers instead of system/add-ons
---
 .../org/jboss/as/patching/generator/DistributionProcessor.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/patch-gen/src/main/java/org/jboss/as/patching/generator/DistributionProcessor.java b/patch-gen/src/main/java/org/jboss/as/patching/generator/DistributionProcessor.java
index 8bc5736..3005f9c 100644
--- a/patch-gen/src/main/java/org/jboss/as/patching/generator/DistributionProcessor.java
+++ b/patch-gen/src/main/java/org/jboss/as/patching/generator/DistributionProcessor.java
@@ -194,11 +194,12 @@ public boolean accept(File pathName) {
             context.addLayer(newParent, layer, layerDir);
         }
         // Finally process the add-ons
+        final DistributionContentItem addOnsParent = DistributionStructureImpl.createMiscItem(parent, layersConfig.getAddOnsPath());
         final File addOnsDir = new File(root, layersConfig.getAddOnsPath());
         final File[] addOnsList = addOnsDir.listFiles();
         if (addOnsList != null) {
             for (final File addOn : addOnsList) {
-                context.addAddOn(newParent, addOn.getName(), addOn);
+                context.addAddOn(addOnsParent, addOn.getName(), addOn);
             }
         }
     }