[cxf] branch master updated: [CXF-7996] Fix '@Encode' TCK test. Fixing PMD issues

[reta]

This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new 006d9ed  [CXF-7996] Fix '@Encode' TCK test. Fixing PMD issues
006d9ed is described below

commit 006d9ed6c3643eafb1db26b622254e395fd004b7
Author: reta <drr...@gmail.com>
AuthorDate: Fri Apr 16 22:24:09 2021 -0400

    [CXF-7996] Fix '@Encode' TCK test. Fixing PMD issues
---
 .../jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
index f82fcf4..f264b48 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
@@ -1038,8 +1038,7 @@ public final class JAXRSUtils {
                 InputStream entityStream = copyAndGetEntityStream(m);
                 String body = FormUtils.readBody(entityStream, enc);
                 // Do not decode unless the key is empty value, fe 
@FormParam("")
-                FormUtils.populateMapFromStringOrHttpRequest(params, m, body, 
enc, 
-                    StringUtils.isEmpty(key) ? decode : false);
+                FormUtils.populateMapFromStringOrHttpRequest(params, m, body, 
enc, StringUtils.isEmpty(key) && decode);
             } else {
                 if ("multipart".equalsIgnoreCase(mt.getType())
                     && MediaType.MULTIPART_FORM_DATA_TYPE.isCompatible(mt)) {