[hibernate-commits] [hibernate/hibernate-orm] e9405f: HHH-1168 - Problem combining locking and paging on...
Branch: refs/heads/4.1
Home: https://github.com/hibernate/hibernate-orm
Commit: e9405fe0314e721e18c3af738055164b40eecf4e
https://github.com/hibernate/hibernate-orm/commit/e9405fe0314e721e18c3af7...
Author: Steve Ebersole <steve(a)hibernate.org>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M hibernate-core/src/main/java/org/hibernate/LockOptions.java
M hibernate-core/src/main/java/org/hibernate/Query.java
M hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
M hibernate-core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java
M
hibernate-core/src/main/java/org/hibernate/hql/internal/classic/QueryTranslatorImpl.java
M hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
M hibernate-core/src/main/java/org/hibernate/internal/SQLQueryImpl.java
M hibernate-core/src/main/java/org/hibernate/loader/Loader.java
M hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java
M hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java
M hibernate-core/src/main/java/org/hibernate/loader/hql/QueryLoader.java
A hibernate-core/src/test/java/org/hibernate/test/locking/paging/Door.java
A
hibernate-core/src/test/java/org/hibernate/test/locking/paging/PagingAndLockingTest.java
M hibernate-core/src/test/resources/hibernate.properties
M hibernate-entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java
M
hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/lock/QueryLockingTest.java
Log Message:
-----------
HHH-1168 - Problem combining locking and paging on Oracle
(cherry picked from commit 4b2871cfba53541d34a74a07b1fc588ce3eaaa51)
Conflicts:
hibernate-core/src/main/java/org/hibernate/internal/StoredProcedureOutputsImpl.java
hibernate-core/src/main/java/org/hibernate/loader/Loader.java
hibernate-core/src/main/java/org/hibernate/loader/collection/DynamicBatchingCollectionInitializerBuilder.java
hibernate-core/src/main/java/org/hibernate/loader/entity/DynamicBatchingEntityLoaderBuilder.java
hibernate-entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java