Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
===================================================================
diff -u -rc64cce689335f5231d29ade2108f98f94f2e97f4 -rd31cb64296f9c1d3020ac745a40de18329df2b88
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	(.../LearningAction.java)	(revision c64cce689335f5231d29ade2108f98f94f2e97f4)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	(.../LearningAction.java)	(revision d31cb64296f9c1d3020ac745a40de18329df2b88)
@@ -48,7 +48,6 @@
 import org.apache.struts.action.ActionRedirect;
 import org.apache.tomcat.util.json.JSONException;
 import org.apache.tomcat.util.json.JSONObject;
-import org.hibernate.exception.LockAcquisitionException;
 import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
@@ -71,6 +70,7 @@
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
+import org.springframework.dao.CannotAcquireLockException;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -498,7 +498,7 @@
 	    try {
 		returnValue = command.call();
 		break;
-	    } catch (LockAcquisitionException e) {
+	    } catch (CannotAcquireLockException e) {
 		if (i == MAX_TRANSACTION_RETRIES - 1) {
 		    throw new ScratchieApplicationException(e);
 		}