Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-5275 - Criteria.setLockMode does not work correctly

This commit is contained in:
Steve Ebersole 2012-01-09 17:53:24 -06:00
parent 35ce5bfef7
commit a41efe37d5
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hibernate-core/src/matrix/java/org/hibernate/test/locking/A.java
View File

@ -36,7 +36,7 @@ import org.hibernate.annotations.GenericGenerator;
@Entity
@Table( name = "T_LOCK_A" )
public class A {
private Integer id;
private Long id;
private String value;
public A() {
@ -49,11 +49,11 @@ public class A {
@Id
@GeneratedValue( generator = "increment" )
@GenericGenerator( name = "increment", strategy = "increment" )
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}

9
hibernate-core/src/matrix/java/org/hibernate/test/locking/LockModeTest.java
View File

@ -42,6 +42,7 @@ import org.hibernate.testing.async.Executable;
import org.hibernate.testing.async.TimedExecutor;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
@ -52,6 +53,8 @@ import static org.junit.Assert.fail;
*/
@TestForIssue( jiraKey = "HHH-5275")
public class LockModeTest extends BaseCoreFunctionalTestCase {
private Long id;
@Override
protected Class<?>[] getAnnotatedClasses() {
return new Class[] { A.class };
@ -61,7 +64,7 @@ public class LockModeTest extends BaseCoreFunctionalTestCase {
public void createData() {
Session session = sessionFactory().openSession();
session.beginTransaction();
session.save( new A( "it" ) );
id = (Long) session.save( new A( "it" ) );
session.getTransaction().commit();
session.close();
}
@ -82,7 +85,7 @@ public class LockModeTest extends BaseCoreFunctionalTestCase {
Session s1 = sessionFactory().openSession();
s1.beginTransaction();
try {
A it = (A) s1.get( A.class, 1, LockMode.PESSIMISTIC_WRITE );
A it = (A) s1.get( A.class, id, LockMode.PESSIMISTIC_WRITE );
// make sure we got it
assertNotNull( it );
@ -200,7 +203,7 @@ public class LockModeTest extends BaseCoreFunctionalTestCase {
// to write a locked row
A it = (A) s.get(
A.class,
1,
id,
new LockOptions( LockMode.PESSIMISTIC_WRITE ).setTimeOut( LockOptions.NO_WAIT )
);
it.setValue( "changed" );