Skip to content

Commit 7aa6376

Browse files
authored
Merge branch 'eclipse-ee4j:master' into Bug1562_%Type_operator_parsingerror
2 parents a90ed8a + 2a98b7f commit 7aa6376

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sequencing/UUIDSequence.java

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2011, 2022 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2011, 2022 Oracle, IBM and/or its affiliates. All rights reserved.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,6 +12,8 @@
1212

1313
// Contributors:
1414
// Oracle - initial API and implementation
15+
// 08/10/2022-4.0 Jody Grassel
16+
// - ECL1535 : UUIDGenerator intermittently fails to initialize
1517
package org.eclipse.persistence.sequencing;
1618

1719
import java.util.UUID;
@@ -31,6 +33,16 @@ public UUIDSequence(String name) {
3133
super(name);
3234
}
3335

36+
@Override
37+
public boolean equals(Object obj) {
38+
if (obj instanceof UUIDSequence) {
39+
UUIDSequence other = (UUIDSequence)obj;
40+
return this.getName().equals(other.getName());
41+
} else {
42+
return false;
43+
}
44+
}
45+
3446
@Override
3547
public Object getGeneratedValue(Accessor accessor, AbstractSession writeSession, String seqName) {
3648
ValueReadQuery query = getDatasourcePlatform().getUUIDQuery();

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
<mysql.version>8.0.28</mysql.version>
232232
<mariadb.version>3.0.6</mariadb.version>
233233
<mssql.version>10.2.1.jre11</mssql.version>
234-
<pgsql.version>42.4.0</pgsql.version>
234+
<pgsql.version>42.4.1</pgsql.version>
235235
<!-- CQ #21139, 21140 -->
236236
<logback.version>1.3.0-alpha16</logback.version>
237237
<oracle.jdbc.version>21.6.0.0.1</oracle.jdbc.version>

0 commit comments

Comments
 (0)