diff --git a/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/AltJavaGenerator.java b/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/AltJavaGenerator.java
index 8bba8bc98f1..976ef9daedd 100644
--- a/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/AltJavaGenerator.java
+++ b/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/AltJavaGenerator.java
@@ -776,11 +776,11 @@ private void generateBeanEquals(MessageDescriptor m, String className) {
             } else if( field.isInteger32Type() ) {
                 p("rc ^= ( "+uname.hashCode()+"^"+getterMethod+" );");
             } else if( field.isInteger64Type() ) {
-                p("rc ^= ( "+uname.hashCode()+"^(new Long("+getterMethod+")).hashCode() );");
+                p("rc ^= ( "+uname.hashCode()+"^(Long.valueOf("+getterMethod+")).hashCode() );");
             } else if( field.getType()==FieldDescriptor.DOUBLE_TYPE ) {
-                p("rc ^= ( "+uname.hashCode()+"^(new Double("+getterMethod+")).hashCode() );");
+                p("rc ^= ( "+uname.hashCode()+"^(Double.valueOf("+getterMethod+")).hashCode() );");
             } else if( field.getType()==FieldDescriptor.FLOAT_TYPE ) {
-                p("rc ^= ( "+uname.hashCode()+"^(new Double("+getterMethod+")).hashCode() );");
+                p("rc ^= ( "+uname.hashCode()+"^(Double.valueOf("+getterMethod+")).hashCode() );");
             } else if( field.getType()==FieldDescriptor.BOOL_TYPE ) {
                 p("rc ^= ( "+uname.hashCode()+"^ ("+getterMethod+"? "+counter+":-"+counter+") );");
             } else {
diff --git a/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/JavaGenerator.java b/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/JavaGenerator.java
index e33929ff48e..6614743b83f 100644
--- a/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/JavaGenerator.java
+++ b/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/JavaGenerator.java
@@ -563,11 +563,11 @@ private void generateMethodEquals(MessageDescriptor m, String className) {
 	            } else if( field.isInteger32Type() ) {
 	                p("rc ^= ( "+uname.hashCode()+"^"+getterMethod+" );");
 	            } else if( field.isInteger64Type() ) {
-	                p("rc ^= ( "+uname.hashCode()+"^(new Long("+getterMethod+")).hashCode() );");
+	                p("rc ^= ( "+uname.hashCode()+"^(Long.valueOf("+getterMethod+")).hashCode() );");
 	            } else if( field.getType()==FieldDescriptor.DOUBLE_TYPE ) {
-	                p("rc ^= ( "+uname.hashCode()+"^(new Double("+getterMethod+")).hashCode() );");
+	                p("rc ^= ( "+uname.hashCode()+"^(Double.valueOf("+getterMethod+")).hashCode() );");
 	            } else if( field.getType()==FieldDescriptor.FLOAT_TYPE ) {
-	                p("rc ^= ( "+uname.hashCode()+"^(new Double("+getterMethod+")).hashCode() );");
+	                p("rc ^= ( "+uname.hashCode()+"^(Double.valueOf("+getterMethod+")).hashCode() );");
 	            } else if( field.getType()==FieldDescriptor.BOOL_TYPE ) {
 	                p("rc ^= ( "+uname.hashCode()+"^ ("+getterMethod+"? "+counter+":-"+counter+") );");
 	            } else {