Index: lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java
===================================================================
diff -u -rb6ed1309cf89ecede6717145c629d7cb3b842582 -r5ad7a601fa0abc84a024e8b075349a47c5421fd5
--- lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java	(.../NotebookEntryDAO.java)	(revision b6ed1309cf89ecede6717145c629d7cb3b842582)
+++ lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java	(.../NotebookEntryDAO.java)	(revision 5ad7a601fa0abc84a024e8b075349a47c5421fd5)
@@ -50,11 +50,10 @@
 							+ " where user_id=? and external_id_type=?"
 							+ " order by external_signature desc, create_date desc";
 	
-	
-	public void saveOrUpdate(NotebookEntry notebookEntry) {
-		this.saveOrUpdate(notebookEntry);
-		this.getSession().flush();
-	}
+        public void saveOrUpdate(NotebookEntry notebookEntry) {
+        	insertOrUpdate(notebookEntry);
+        	this.getSession().flush();
+        }
 
 	public List<NotebookEntry> get(Long id, Integer idType, String signature, Integer userID) {
 		return (List<NotebookEntry>)(doFind(SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID_SIG, new Object[]{id, idType, signature, userID}));
Index: lams_common/src/java/org/lamsfoundation/lams/presence/dao/hibernate/PresenceChatDAO.java
===================================================================
diff -u -rb6ed1309cf89ecede6717145c629d7cb3b842582 -r5ad7a601fa0abc84a024e8b075349a47c5421fd5
--- lams_common/src/java/org/lamsfoundation/lams/presence/dao/hibernate/PresenceChatDAO.java	(.../PresenceChatDAO.java)	(revision b6ed1309cf89ecede6717145c629d7cb3b842582)
+++ lams_common/src/java/org/lamsfoundation/lams/presence/dao/hibernate/PresenceChatDAO.java	(.../PresenceChatDAO.java)	(revision 5ad7a601fa0abc84a024e8b075349a47c5421fd5)
@@ -64,7 +64,7 @@
 
     @Override
     public void saveOrUpdate(Object object) {
-	this.saveOrUpdate(object);
+	insertOrUpdate(object);
 	this.getSession().flush();
     }