svn commit: r720709 - in /ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel: BpelDAOConnectionImpl.java MessageExchangeDaoImpl.java

[midon]

Author: midon
Date: Tue Nov 25 18:07:46 2008
New Revision: 720709

URL: http://svn.apache.org/viewvc?rev=720709&view=rev
Log:
ODE-436: mex id and primary key are distinct

Modified:
    
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java
    
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java

Modified: 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java?rev=720709&r1=720708&r2=720709&view=diff
==============================================================================
--- 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java
 (original)
+++ 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java
 Tue Nov 25 18:07:46 2008
@@ -74,7 +74,9 @@
 
     public MessageExchangeDAO getMessageExchange(String mexId) {
         try {
-            HMessageExchange mex = (HMessageExchange) 
_session.get(HMessageExchange.class, new Long(mexId));
+            org.hibernate.Query query = _session.createQuery("from 
HMessageExchange x where x.mexId = ?");
+            query.setString(0, mexId);
+            HMessageExchange mex = (HMessageExchange) query.uniqueResult();
             return mex == null ? null : new MessageExchangeDaoImpl(_sm, mex);
         } catch (HibernateException e) {
             __log.error("DbError", e);

Modified: 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java?rev=720709&r1=720708&r2=720709&view=diff
==============================================================================
--- 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
 (original)
+++ 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
 Tue Nov 25 18:07:46 2008
@@ -61,7 +61,7 @@
     }
 
     public String getMessageExchangeId() {
-        return _hself.getId().toString();
+        return _hself.getMexId();
     }
 
     public MessageDAO getResponse() {