From 62d46b62da613fc1e49631bffac952f8df28f91c Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Thu, 25 Nov 2021 07:37:40 +0100
Subject: [PATCH] WW-5149 Makes labelPosition preferred option than
 labelposition

---
 .../java/org/apache/struts2/views/jsp/ui/AbstractUITag.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
index 44bad4364..c5548f70b 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
@@ -93,7 +93,7 @@ public abstract class AbstractUITag extends ComponentTagSupport implements Dynam
         uiBean.setDisabled(disabled);
         uiBean.setLabel(label);
         uiBean.setLabelSeparator(labelSeparator);
-        if (labelposition != null) {
+        if (labelposition != null && labelPosition == null) {
             uiBean.setLabelposition(labelposition);
         } else {
             uiBean.setLabelPosition(labelPosition);