diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaTestsGenerator.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaTestsGenerator.java
index bbbb9636cc2..822d2adba84 100644
--- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaTestsGenerator.java
+++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaTestsGenerator.java
@@ -20,6 +20,7 @@
 import java.io.PrintWriter;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 
 import org.codehaus.jam.JAnnotation;
 import org.codehaus.jam.JClass;
@@ -180,7 +181,7 @@ protected void generateFile(PrintWriter out) {
                     if (size == null) {
                         size = "2";
                     }
-                    if (arrayType == jclass.getSimpleName()) {
+                    if (Objects.equals(arrayType, jclass.getSimpleName())) {
                         size = "0";
                     }
                     out.println("        {");