Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4827 - in labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services: . EJB dbtables
|
From: <jbo...@li...> - 2006-06-26 19:27:53
|
Author: estebanschifman
Date: 2006-06-26 15:27:42 -0400 (Mon, 26 Jun 2006)
New Revision: 4827
Modified:
labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java
labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java
labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java
labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java
labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java
labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java
labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java
labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java
labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java
labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/DaoUidTable.java
Log:
Minor adjustments to fix problems brought by dynamic config of Object Store
Object UID and SnapshotUID are now one and the same.
No need in Rosetta for several snapshots of the same object.
Modified: labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java 2006-06-26 17:32:06 UTC (rev 4826)
+++ labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java 2006-06-26 19:27:42 UTC (rev 4827)
@@ -5,7 +5,7 @@
/**
* Remote interface for JbossEsbNotificationHandler.
- * @xdoclet-generated at 25-06-06
+ * @xdoclet-generated at 26-06-06
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java 2006-06-26 17:32:06 UTC (rev 4826)
+++ labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java 2006-06-26 19:27:42 UTC (rev 4827)
@@ -5,7 +5,7 @@
/**
* Local home interface for JbossEsbNotificationHandler.
- * @xdoclet-generated at 25-06-06
+ * @xdoclet-generated at 26-06-06
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java 2006-06-26 17:32:06 UTC (rev 4826)
+++ labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java 2006-06-26 19:27:42 UTC (rev 4827)
@@ -5,7 +5,7 @@
/**
* Remote interface for JbossEsbPersistHandler.
- * @xdoclet-generated at 25-06-06
+ * @xdoclet-generated at 26-06-06
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java 2006-06-26 17:32:06 UTC (rev 4826)
+++ labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java 2006-06-26 19:27:42 UTC (rev 4827)
@@ -126,6 +126,7 @@
if (lUid < 1)
{ lUid = doAssignUid();
p_oBO.setUid(lUid);
+ p_oBO.setSnap(lUid);
}
ObjLocator oLoc = p_oBO.getObjLocator();
@@ -202,10 +203,8 @@
throws Exception
{ long lObjUid = p_oBo.getUid();
if (lObjUid < 1) p_oBo.setUid(lObjUid=doAssignUid());
+ p_oBo.setSnap(lObjUid);
- long lSnapUid = p_oBo.getSnap();
- if (lSnapUid< 1) p_oBo.setSnap(lSnapUid = doAssignUid());
-
// Set Timestamp
long lNow = System.currentTimeMillis();
p_oBo.setStamp(lNow);
@@ -226,7 +225,7 @@
m_oDataConn.execUpdWait(PS,10);
}
- return lSnapUid;
+ return lObjUid;
} //__________________________________
protected void updateLocTbl(BaseBusinessObject p_oBo)
Modified: labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java 2006-06-26 17:32:06 UTC (rev 4826)
+++ labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java 2006-06-26 19:27:42 UTC (rev 4827)
@@ -5,7 +5,7 @@
/**
* Home interface for JbossEsbPersistHandler.
- * @xdoclet-generated at ${TODAY}
+ * @xdoclet-generated at 26-06-06
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java 2006-06-26 17:32:06 UTC (rev 4826)
+++ labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java 2006-06-26 19:27:42 UTC (rev 4827)
@@ -5,7 +5,7 @@
/**
* Local interface for JbossEsbPersistHandler.
- * @xdoclet-generated at ${TODAY}
+ * @xdoclet-generated at 26-06-06
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java 2006-06-26 17:32:06 UTC (rev 4826)
+++ labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java 2006-06-26 19:27:42 UTC (rev 4827)
@@ -5,7 +5,7 @@
/**
* Local home interface for JbossEsbPersistHandler.
- * @xdoclet-generated at 25-06-06
+ * @xdoclet-generated at 26-06-06
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java 2006-06-26 17:32:06 UTC (rev 4826)
+++ labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java 2006-06-26 19:27:42 UTC (rev 4827)
@@ -50,7 +50,8 @@
{ return m_oSnapH.addObject(BaseBusinessObject.getFromDTO(p_oDto));
} //__________________________________
public long addObject (BaseBusinessObject p_oBo) throws Exception
- { return m_oSnapH.addObject(p_oBo);
+ { p_oBo.setPackage();
+ return m_oSnapH.addObject(p_oBo);
} //__________________________________
public BaseBusinessObject getObject (Class p_oCls, long p_lUid) throws Exception
{ return m_oSnapH.getObject(p_oCls,p_lUid);
@@ -59,7 +60,8 @@
{ m_oSnapH.rmvObject(p_oCls, p_lUid);
} //__________________________________
public void rplObject (BaseBusinessObject p_o) throws Exception
- { m_oSnapH.rplObject(p_o);
+ { p_o.setPackage();
+ m_oSnapH.rplObject(p_o);
} //__________________________________
public ObjLocator[] getLocatorList(Class p_oCls, Properties p_oProp)
{
Modified: labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java 2006-06-26 17:32:06 UTC (rev 4826)
+++ labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java 2006-06-26 19:27:42 UTC (rev 4827)
@@ -48,7 +48,9 @@
{ return m_oSnapH.getUidChunk(p_iQ);
} //__________________________________
public long addObject (BaseBusinessObject p_oBo) throws Exception
- { return (null==p_oBo) ? -1 : m_oSnapH.addDTO(p_oBo.toDTO());
+ { if (null==p_oBo) return -1;
+ p_oBo.setPackage();
+ return m_oSnapH.addDTO(p_oBo.toDTO());
} //__________________________________
public BaseBusinessObject getObject (Class p_oCls, long p_lUid) throws Exception
{
@@ -59,7 +61,9 @@
{ m_oSnapH.rmvObject(p_oCls, p_lUid);
} //__________________________________
public void rplObject (BaseBusinessObject p_o) throws Exception
- { m_oSnapH.rplDTO(p_o.toDTO());
+ { if (null==p_o) return;
+ p_o.setPackage();
+ m_oSnapH.rplDTO(p_o.toDTO());
} //__________________________________
public ObjLocator[] getLocatorList(Class p_oCls, Properties p_oProp)
Modified: labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/DaoUidTable.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/DaoUidTable.java 2006-06-26 17:32:06 UTC (rev 4826)
+++ labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/DaoUidTable.java 2006-06-26 19:27:42 UTC (rev 4827)
@@ -203,7 +203,10 @@
ResultSet rs = getConn().execQueryWait(PS,30);
boolean bOK=false;
- try { rs.next(); bOK = true; }
+ try
+ { if (rs.next())
+ bOK = true;
+ }
catch (Exception e1) { getConn().rollback(); }
if (! bOK) throw new Exception("Select FAILED jbossEsb.getChunk()");
|
