Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesSessionDAO.java
===================================================================
diff -u -r1688016bbb43db756bca9b93361c2a3833089d12 -r363bdebfd5f12500c30a56db2aec8888fd199c46
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesSessionDAO.java	(.../ISubmitFilesSessionDAO.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesSessionDAO.java	(.../ISubmitFilesSessionDAO.java)	(revision 363bdebfd5f12500c30a56db2aec8888fd199c46)
@@ -51,14 +51,4 @@
     public void createSession(SubmitFilesSession submitSession);
 
     public List<SubmitFilesSession> getSubmitFilesSessionByContentID(Long contentID);
-    
-    
-    
-    /**
-     * Generic method to save an object - handles both update and insert.
-     *
-     * @param o
-     *            the object to save
-     */
-    public void saveObject(Object o);
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitUserDAO.java
===================================================================
diff -u -r1688016bbb43db756bca9b93361c2a3833089d12 -r363bdebfd5f12500c30a56db2aec8888fd199c46
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitUserDAO.java	(.../ISubmitUserDAO.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitUserDAO.java	(.../ISubmitUserDAO.java)	(revision 363bdebfd5f12500c30a56db2aec8888fd199c46)
@@ -61,14 +61,5 @@
     List<StatisticDTO> getLeaderStatisticsBySession(final Long contentId);
     
     List<Long> getReportsForGroup(final Long sessionId, final Long reportId);
-
     
-    /**
-     * Generic method to save an object - handles both update and insert.
-     *
-     * @param o
-     *            the object to save
-     */
-    public void saveObject(Object o);
-    
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20171114.sql
===================================================================
diff -u -r1688016bbb43db756bca9b93361c2a3833089d12 -r363bdebfd5f12500c30a56db2aec8888fd199c46
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20171114.sql	(.../patch20171114.sql)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20171114.sql	(.../patch20171114.sql)	(revision 363bdebfd5f12500c30a56db2aec8888fd199c46)
@@ -3,7 +3,7 @@
 SET FOREIGN_KEY_CHECKS=0;
 ----------------------Put all sql statements below here-------------------------
 
--- LDEV-
+-- LDEV-4482
 
 
 ALTER TABLE tl_lasbmt11_content ADD COLUMN use_select_leader_tool_ouput TINYINT(1) NOT NULL DEFAULT 0;
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -r1688016bbb43db756bca9b93361c2a3833089d12 -r363bdebfd5f12500c30a56db2aec8888fd199c46
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 363bdebfd5f12500c30a56db2aec8888fd199c46)
@@ -732,7 +732,6 @@
 	
 	
 	SubmitFilesSession session = getSessionById(sessionID);
-	System.out.println("MARK FILE NAME>>"+markFile.getFileName());
 	SubmitFilesContent content = session.getContent();
 	if (content.isUseSelectLeaderToolOuput()) {
 	    List<Long> reportIDs = submitUserDAO.getReportsForGroup(sessionID, reportID);
@@ -1411,7 +1410,7 @@
 
 		// set group leader
 		submitFileSession.setGroupLeader(leader);
-		submitFilesSessionDAO.saveObject(submitFileSession);
+		submitFilesSessionDAO.insertOrUpdate(submitFileSession);
 	    }
 	}
 
@@ -1428,7 +1427,7 @@
 	// Save it no matter if the user already exists.
 	// At checkLeaderSelectToolForSessionLeader() the user is added to session.
 	// Sometimes session save is earlier that user save in another thread, leading to an exception.
-	submitUserDAO.saveObject(user);
+	submitUserDAO.insertOrUpdate(user);
     }