Index: lams_build/lib/lams/lams-central.jar
===================================================================
diff -u -rb1347f5ba94ad0aa026c050a042d9fc62b07d1e5 -rca7c2c1df95905308664d79ec01937f8deb4dc7e
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
===================================================================
diff -u -r0bda29599bb3802b163c7aa507d2ee9dd47ec6a6 -rca7c2c1df95905308664d79ec01937f8deb4dc7e
--- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	(.../ObjectExtractor.java)	(revision 0bda29599bb3802b163c7aa507d2ee9dd47ec6a6)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	(.../ObjectExtractor.java)	(revision ca7c2c1df95905308664d79ec01937f8deb4dc7e)
@@ -63,8 +63,8 @@
 import org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO;
 import org.lamsfoundation.lams.usermanagement.dao.hibernate.WorkspaceFolderDAO;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessor;
-import org.lamsfoundation.lams.util.wddx.WDDXTAGS;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException;
+import org.lamsfoundation.lams.util.wddx.WDDXTAGS;
 
 /**
  * @author Manpreet Minhas
@@ -308,7 +308,6 @@
 		while (itr.hasNext())
 		{
 		    Activity activity = (Activity)itr.next();
-		    Long activityId = activity.getActivityId();
 		    if (!updatedSet.contains(activity))
 		    { 
 			      itr.remove(); //removes object from collection;
@@ -352,7 +351,6 @@
 		while (itr.hasNext())
 		{
 		    Transition transition = (Transition)itr.next();
-		    Long transitionId = transition.getTransitionId();
 		    if (!updatedSet.contains(transition))
 		    {
 		       /* This will leave orphan content in the tool tables. It can be removed by the tool content cleaning job, 
@@ -385,13 +383,13 @@
 			}
 			
 			Activity activityObject = Activity.getActivityInstance(activityTypeID.intValue());
-			processActivityType(activityObject,activityDetails);
 			activity =(Activity)activityObject;
 	    }
 	    else
 	    {
 	        activity = existingActivity; //otherwise load existing activity
 	    }
+		processActivityType(activity,activityDetails);
 		
 		
 	    if (keyExists(activityDetails, WDDXTAGS.ACTIVITY_TYPE_ID))