From 3f4f0cafa9bf4fde8c368f58c36eb79ea7381afd Mon Sep 17 00:00:00 2001 From: lukaseder Date: Wed, 8 Aug 2018 14:46:58 +0200 Subject: [PATCH] [#7732] XJC generated classes should compare Pattern.pattern() in generated equals() and hashCode() methods --- jOOQ/src/main/java/org/jooq/conf/MappedSchema.java | 2 +- jOOQ/src/main/java/org/jooq/conf/MappedTable.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/conf/MappedSchema.java b/jOOQ/src/main/java/org/jooq/conf/MappedSchema.java index 34bfc60241..2173d42e81 100644 --- a/jOOQ/src/main/java/org/jooq/conf/MappedSchema.java +++ b/jOOQ/src/main/java/org/jooq/conf/MappedSchema.java @@ -258,7 +258,7 @@ public class MappedSchema final int prime = 31; int result = 1; result = ((prime*result)+((input == null)? 0 :input.hashCode())); - result = ((prime*result)+((inputExpression == null)? 0 :inputExpression.hashCode())); + result = ((prime*result)+((inputExpression == null)? 0 :inputExpression.pattern().hashCode())); result = ((prime*result)+((output == null)? 0 :output.hashCode())); result = ((prime*result)+((tables == null)? 0 :tables.hashCode())); return result; diff --git a/jOOQ/src/main/java/org/jooq/conf/MappedTable.java b/jOOQ/src/main/java/org/jooq/conf/MappedTable.java index 9be69f264b..7577fb2818 100644 --- a/jOOQ/src/main/java/org/jooq/conf/MappedTable.java +++ b/jOOQ/src/main/java/org/jooq/conf/MappedTable.java @@ -204,7 +204,7 @@ public class MappedTable final int prime = 31; int result = 1; result = ((prime*result)+((input == null)? 0 :input.hashCode())); - result = ((prime*result)+((inputExpression == null)? 0 :inputExpression.hashCode())); + result = ((prime*result)+((inputExpression == null)? 0 :inputExpression.pattern().hashCode())); result = ((prime*result)+((output == null)? 0 :output.hashCode())); return result; }