From 9f082b264ca4b4ddff1ff134af7521d478082c5b Mon Sep 17 00:00:00 2001
From: Aleksandr Mashchenko <aleksandr.7m@gmail.com>
Date: Tue, 21 Nov 2017 22:26:52 +0200
Subject: [PATCH] Make ConventionConstantConfig inherit map of constants from
 ConstantConfig

---
 .../convention/config/entities/ConventionConstantConfig.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/config/entities/ConventionConstantConfig.java b/plugins/convention/src/main/java/org/apache/struts2/convention/config/entities/ConventionConstantConfig.java
index d151a154f..50bca2c88 100644
--- a/plugins/convention/src/main/java/org/apache/struts2/convention/config/entities/ConventionConstantConfig.java
+++ b/plugins/convention/src/main/java/org/apache/struts2/convention/config/entities/ConventionConstantConfig.java
@@ -18,7 +18,6 @@
  */
 package org.apache.struts2.convention.config.entities;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -60,7 +59,7 @@ public class ConventionConstantConfig extends ConstantConfig {
 
     @Override
     public Map<String, String> getAllAsStringsMap() {
-        Map<String, String> map = new HashMap<>();
+        Map<String, String> map = super.getAllAsStringsMap();
 
         map.put(ConventionConstants.CONVENTION_ACTION_CONFIG_BUILDER, beanConfToString(conventionActionConfigBuilder));
         map.put(ConventionConstants.CONVENTION_ACTION_NAME_BUILDER, beanConfToString(conventionActionNameBuilder));