Upgraded hibernate to fix MID-3247: Lot of HHH000444 warnings when ru…

…nning on Oracle
Evolveum · Jul 1, 2016 · 159a9cd · 159a9cd
1 parent 850bec3
commit 159a9cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -69,7 +69,7 @@
         <xml.resolver.version>1.2</xml.resolver.version>
         <xmlunit.version>2.1.1</xmlunit.version>
         <cron4j.version>2.2.3</cron4j.version>
-        <hibernate.version>4.3.8.Final</hibernate.version>
+        <hibernate.version>4.3.11.Final</hibernate.version>
         <h2.version>1.3.171</h2.version>
         <jdbc.postgres>9.3-1102-jdbc41</jdbc.postgres>
         <jdbc.mysql>5.1.31</jdbc.mysql>

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
@@ -155,9 +155,7 @@ public <T extends ObjectType> PrismObject<T> getObjectInternal(Session session,
 				lockOptions.setLockMode(LockMode.PESSIMISTIC_WRITE);
 				lockedForUpdateViaHibernate = true;
 			} else if (getConfiguration().isLockForUpdateViaSql()) {
-				if (LOGGER.isTraceEnabled()) {
-					LOGGER.trace("Trying to lock object " + oid + " for update (via SQL)");
-				}
+				LOGGER.trace("Trying to lock object {} for update (via SQL)", oid);
 				long time = System.currentTimeMillis();
 				SQLQuery q = session.createSQLQuery("select oid from m_object where oid = ? for update");
 				q.setString(0, oid);
@@ -166,19 +164,19 @@ public <T extends ObjectType> PrismObject<T> getObjectInternal(Session session,
 					return throwObjectNotFoundException(type, oid);
 				}
 				if (LOGGER.isTraceEnabled()) {
-					LOGGER.trace("Locked via SQL (in " + (System.currentTimeMillis() - time) + " ms)");
+					LOGGER.trace("Locked via SQL (in {} ms)", System.currentTimeMillis() - time);
 				}
 				lockedForUpdateViaSql = true;
 			}
 		}
 
 		if (LOGGER.isTraceEnabled()) {
 			if (lockedForUpdateViaHibernate) {
-				LOGGER.trace("Getting object " + oid + " with locking for update (via hibernate)");
+				LOGGER.trace("Getting object {} with locking for update (via hibernate)", oid);
 			} else if (lockedForUpdateViaSql) {
-				LOGGER.trace("Getting object " + oid + ", already locked for update (via SQL)");
+				LOGGER.trace("Getting object {}, already locked for update (via SQL)", oid);
 			} else {
-				LOGGER.trace("Getting object " + oid + " without locking for update");
+				LOGGER.trace("Getting object {} without locking for update", oid);
 			}
 		}