Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml,v
diff -u -r1.47.2.6 -r1.47.2.7
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	27 Jun 2016 10:01:24 -0000	1.47.2.6
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	8 Mar 2017 06:26:11 -0000	1.47.2.7
@@ -14,11 +14,6 @@
 		<id name="lessonId" type="java.lang.Long" column="lesson_id">
 			<generator class="native" />
 		</id>
-         <version
-            name="version"
-            column="version"
-            type="java.lang.Integer">
-         </version>
     	<property name="lessonDescription" type="java.lang.String" 
     			 column="description" length="65535">
 	    </property>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170308.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java,v
diff -u -r1.45.2.5 -r1.45.2.6
--- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	27 Jun 2016 10:01:24 -0000	1.45.2.5
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	8 Mar 2017 06:26:11 -0000	1.45.2.6
@@ -80,9 +80,6 @@
     /** identifier field */
     private Long lessonId;
 
-    /** Hibernate managed version field */
-    private Integer version;
-
     /** persistent field */
     private String lessonName;
 
@@ -261,17 +258,6 @@
     }
 
     /**
-     * Hibernate version column - updated automatically
-     */
-    public Integer getVersion() {
-	return this.version;
-    }
-
-    public void setVersion(Integer version) {
-	this.version = version;
-    }
-
-    /**
      * @return Returns the lessonName.
      */
     public String getLessonName() {
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attic/ForumToolSession.hbm.xml,v
diff -u -r1.6.2.3 -r1.6.2.4
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	7 Mar 2017 06:07:18 -0000	1.6.2.3
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	8 Mar 2017 06:26:10 -0000	1.6.2.4
@@ -27,12 +27,6 @@
             </generator>
         </id>
 
-        <version
-            name="version"
-            column="version"
-            type="int"
-        />
-
         <property
             name="sessionEndDate"
             type="java.util.Date"
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170308.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java,v
diff -u -r1.9.14.4 -r1.9.14.5
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java	11 May 2016 07:14:59 -0000	1.9.14.4
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java	8 Mar 2017 06:26:10 -0000	1.9.14.5
@@ -50,9 +50,6 @@
     //content topics copyed (1) or not (0)
     private int status;
 
-    //optimistic lock 
-    private int version;
-
 //  **********************************************************
     //		Function method for ForumToolSession
 //  **********************************************************
@@ -174,16 +171,4 @@
     public void setMarkReleased(boolean markReleased) {
 	this.markReleased = markReleased;
     }
-
-    /**
-     *
-     */
-    public int getVersion() {
-	return version;
-    }
-
-    public void setVersion(int version) {
-	this.version = version;
-    }
-
-}
+}
\ No newline at end of file
Index: lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/Attic/ScribeSession.hbm.xml,v
diff -u -r1.3.2.3 -r1.3.2.4
--- lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml	7 Mar 2017 06:07:27 -0000	1.3.2.3
+++ lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml	8 Mar 2017 06:26:12 -0000	1.3.2.4
@@ -26,12 +26,6 @@
             </generator>
         </id>
 
-        <version
-            name="version"
-            column="version"
-            type="int"
-        />
-
         <property
             name="sessionEndDate"
             type="java.util.Date"
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20170308.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.java,v
diff -u -r1.6.14.5 -r1.6.14.6
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.java	3 Jan 2017 20:55:14 -0000	1.6.14.5
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.java	8 Mar 2017 06:26:12 -0000	1.6.14.6
@@ -40,15 +40,13 @@
 
     private static Logger log = Logger.getLogger(ScribeSession.class);
     /**
-     * 
+     *
      */
     private static final long serialVersionUID = 4407078136514639026L;
 
     // Fields
     private Long uid;
 
-    private Integer version;
-
     private Date sessionEndDate;
 
     private Date sessionStartDate;
@@ -104,18 +102,7 @@
     /**
      *
      */
-    public Integer getVersion() {
-	return version;
-    }
 
-    public void setVersion(Integer version) {
-	this.version = version;
-    }
-
-    /**
-     *
-     */
-
     public Date getSessionEndDate() {
 	return this.sessionEndDate;
     }
@@ -247,7 +234,7 @@
 
     /**
      * toString
-     * 
+     *
      * @return String
      */
     @Override
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java,v
diff -u -r1.17.2.4 -r1.17.2.5
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java	11 May 2016 07:35:46 -0000	1.17.2.4
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java	8 Mar 2017 06:26:12 -0000	1.17.2.5
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.scribe.web.actions;
 
 import java.io.IOException;
@@ -60,21 +59,7 @@
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
-import org.springframework.orm.ObjectOptimisticLockingFailureException;
 
-/**
- * @author
- * @version
- *
- *
- *
- *
- *
- *
- *
- *
- *
- */
 public class LearningAction extends LamsDispatchAction {
 
     private static Logger log = Logger.getLogger(LearningAction.class);
@@ -96,13 +81,7 @@
 	if (scribeService == null) {
 	    scribeService = ScribeServiceProxy.getScribeService(this.getServlet().getServletContext());
 	}
-	//try to clone scribe heading from content. This method will execute
-	//for every new learner enter, but the heading only copied once.
-	try {
-	    scribeService.createReportEntry(toolSessionID);
-	} catch (ObjectOptimisticLockingFailureException e) {
-	    LearningAction.log.debug("Multiple learner get into scribe simultaneously. Cloning report entry skipped");
-	}
+	scribeService.createReportEntry(toolSessionID);
 
 	// Retrieve the session and content.
 	ScribeSession scribeSession = scribeService.getSessionBySessionId(toolSessionID);
@@ -139,15 +118,7 @@
 	    } else {
 		// appoint the currentUser as the scribe
 		scribeSession.setAppointedScribe(scribeUser);
-
-		// attempt to update the scribeSession.
-		try {
-		    scribeService.saveOrUpdateScribeSession(scribeSession);
-		} catch (ObjectOptimisticLockingFailureException le) {
-		    // scribeSession has been modified. Reload scribeSession and
-		    // check again.
-		    scribeSession = scribeService.getSessionBySessionId(toolSessionID);
-		}
+		scribeService.saveOrUpdateScribeSession(scribeSession);
 	    }
 	}