[tomee] branch master updated: Fix logic in assertProperties method. Fixes TOMEE-1417

[dds]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 85a712c  Fix logic in assertProperties method. Fixes TOMEE-1417
     new 389c347  Merge pull request #671 from davidsalter/TOMEE-1417
85a712c is described below

commit 85a712c882bf5d521f5ca5144ea1e01f067a5265
Author: David Salter <da...@davidsalter.uk>
AuthorDate: Tue Jul 7 17:34:23 2020 +0100

    Fix logic in assertProperties method. Fixes TOMEE-1417
---
 .../src/test/java/org/apache/openejb/util/PropertiesTest.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/util/PropertiesTest.java
 
b/container/openejb-core/src/test/java/org/apache/openejb/util/PropertiesTest.java
index 5579f38..fe3d349 100644
--- 
a/container/openejb-core/src/test/java/org/apache/openejb/util/PropertiesTest.java
+++ 
b/container/openejb-core/src/test/java/org/apache/openejb/util/PropertiesTest.java
@@ -359,7 +359,7 @@ public class PropertiesTest extends TestCase {
             } else {
                 final Object expectedValue = expected.get(key);
                 final Object actualValue = actual.get(key);
-                if (expectedValue != expectedValue && (expectedValue == null 
|| !expectedValue.equals(actual))) {
+                if (actualValue != expectedValue && (expectedValue == null || 
!expectedValue.equals(actualValue))) {
                     message.append("C 
").append(key).append("=").append(expectedValue).append("\n");
                     message.append("  
").append(key).append("=").append(actualValue).append("\n");
                 }