[portal-commits] JBoss Portal SVN: r6101 - in trunk: test/src/etc and 1 other directory.
Author: julien(a)jboss.com
Date: 2007-01-25 19:38:59 -0500 (Thu, 25 Jan 2007)
New Revision: 6101
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java
trunk/test/src/etc/datasources.xml
Log:
updated InstanceContainer to use a query in lookupNoCache instead of query by criteria
which was causing an issue with oracle 10g
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java 2007-01-25
21:20:38 UTC (rev 6100)
+++
trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java 2007-01-26
00:38:59 UTC (rev 6101)
@@ -23,15 +23,15 @@
package org.jboss.portal.core.impl.model.instance;
import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
-import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
-import org.hibernate.criterion.Restrictions;
+import org.hibernate.Query;
import org.hibernate.exception.ConstraintViolationException;
import org.jboss.portal.common.invocation.InterceptorStackFactory;
import org.jboss.portal.common.invocation.Invocation;
import org.jboss.portal.common.invocation.InvocationException;
import org.jboss.portal.common.invocation.InvocationHandler;
+import org.jboss.portal.common.util.Tools;
import org.jboss.portal.core.model.instance.DuplicateInstanceException;
import org.jboss.portal.core.model.instance.InstanceContainer;
import org.jboss.portal.core.model.instance.InstanceDefinition;
@@ -82,6 +82,9 @@
{
/** . */
+ private static final String BY_INSTANCE_ID_QUERY = "from " +
Tools.getShortNameOf(InstanceDefinitionImpl.class) + " where
instanceId=:instanceId";
+
+ /** . */
protected InterceptorStackFactory stackFactory;
/** . */
@@ -525,10 +528,9 @@
private InstanceDefinitionImpl lookupNoCache(Session session, String id)
{
- Criteria criteria = session.createCriteria(InstanceDefinitionImpl.class);
- criteria.add(Restrictions.naturalId().set("instanceId", id));
- criteria.setCacheable(true);
- return (InstanceDefinitionImpl)criteria.uniqueResult();
+ Query q = session.createQuery(BY_INSTANCE_ID_QUERY);
+ q.setString("instanceId", id);
+ return (InstanceDefinitionImpl)q.uniqueResult();
}
//**********************************************************************
Modified: trunk/test/src/etc/datasources.xml
===================================================================
--- trunk/test/src/etc/datasources.xml 2007-01-25 21:20:38 UTC (rev 6100)
+++ trunk/test/src/etc/datasources.xml 2007-01-26 00:38:59 UTC (rev 6101)
@@ -30,4 +30,13 @@
<user-name>sa</user-name>
<password></password>
</datasource>
+<!--
+ <datasource>
+ <datasource-name>oracle10g</datasource-name>
+
<connection-url>jdbc:oracle:thin:jbossportal/portalpassword@192.168.0.124:1521:orcl</connection-url>
+ <driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
+ <user-name>jbossportal</user-name>
+ <password>portalpassword</password>
+ </datasource>
+-->
</datasources>