Index: lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/Attic/LAMSBaseDAO.java,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java	26 Nov 2014 22:08:25 -0000	1.1.2.1
+++ lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java	26 Nov 2014 22:19:51 -0000	1.1.2.2
@@ -76,8 +76,7 @@
 	 * org.lamsfoundation.lams.dao.IBaseDAO#insertOrUpdate(java.lang.Object)
 	 */
 	public void insertOrUpdate(Object object) {
-		throw new PessimisticLockException("TEST", new SQLException("SQLExceptionReason"), "");
-//		getSession().saveOrUpdate(object);
+		getSession().saveOrUpdate(object);
 	}
 
 	/*