Skip to content

Commit

Permalink
Merge branch 'eclipse-ee4j:master' into Bug1562_%Type_operator_parsin…
Browse files Browse the repository at this point in the history
…gerror
  • Loading branch information
lananda authored Aug 12, 2022
2 parents a90ed8a + 2a98b7f commit 7aa6376
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2022 Oracle, IBM and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand All @@ -12,6 +12,8 @@

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

import java.util.UUID;
Expand All @@ -31,6 +33,16 @@ public UUIDSequence(String name) {
super(name);
}

@Override
public boolean equals(Object obj) {
if (obj instanceof UUIDSequence) {
UUIDSequence other = (UUIDSequence)obj;
return this.getName().equals(other.getName());
} else {
return false;
}
}

@Override
public Object getGeneratedValue(Accessor accessor, AbstractSession writeSession, String seqName) {
ValueReadQuery query = getDatasourcePlatform().getUUIDQuery();
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
<mysql.version>8.0.28</mysql.version>
<mariadb.version>3.0.6</mariadb.version>
<mssql.version>10.2.1.jre11</mssql.version>
<pgsql.version>42.4.0</pgsql.version>
<pgsql.version>42.4.1</pgsql.version>
<!-- CQ #21139, 21140 -->
<logback.version>1.3.0-alpha16</logback.version>
<oracle.jdbc.version>21.6.0.0.1</oracle.jdbc.version>
Expand Down

0 comments on commit 7aa6376

Please sign in to comment.