Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java,v
diff -u -r1.40 -r1.41
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	27 Oct 2006 00:56:19 -0000	1.40
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	12 Jan 2007 05:03:04 -0000	1.41
@@ -133,8 +133,6 @@
 	public void setGroupingDAO(GroupingDAO groupingDAO) {
 		this.groupingDAO = groupingDAO;
 	}
-	/** for sending acknowledgment/error messages back to flash */
-	private FlashMessage flashMessage;
 	
 	/**
 	 * @param transitionDAO The transitionDAO  to set
@@ -249,6 +247,7 @@
 	 * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#getLearningDesignDetails(java.lang.Long)
 	 */
 	public String getLearningDesignDetails(Long learningDesignID)throws IOException{
+		FlashMessage flashMessage= null;
 		LearningDesignDTO learningDesignDTO = learningDesignService.getLearningDesignDTO(learningDesignID);
 		if(learningDesignDTO==null)
 			flashMessage = FlashMessage.getNoSuchLearningDesignExists("getLearningDesignDetails",learningDesignID);
@@ -558,7 +557,7 @@
 	public String getAllLearningDesignDetails()throws IOException{
 		Iterator iterator= getAllLearningDesigns().iterator();
 		ArrayList arrayList = createDesignDetailsPacket(iterator);
-		flashMessage = new FlashMessage("getAllLearningDesignDetails",arrayList);		
+		FlashMessage flashMessage = new FlashMessage("getAllLearningDesignDetails",arrayList);		
 		return flashMessage.serializeMessage();
 	}
 	/**
@@ -585,15 +584,15 @@
 	public String getLearningDesignsForUser(Long userID) throws IOException{
 		List list = learningDesignDAO.getLearningDesignByUserId(userID);
 		ArrayList arrayList = createDesignDetailsPacket(list.iterator());
-		flashMessage = new FlashMessage("getLearningDesignsForUser",arrayList);
+		FlashMessage flashMessage = new FlashMessage("getLearningDesignsForUser",arrayList);
 		return flashMessage.serializeMessage();
 	}	
 	/**
 	 * (non-Javadoc)
 	 * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#getAllLearningLibraryDetails()
 	 */
 	public String getAllLearningLibraryDetails()throws IOException{
-		flashMessage = new FlashMessage("getAllLearningLibraryDetails",learningDesignService.getAllLearningLibraryDetails());
+		FlashMessage flashMessage = new FlashMessage("getAllLearningLibraryDetails",learningDesignService.getAllLearningLibraryDetails());
 		return flashMessage.serializeMessage();
 	}
 	
@@ -609,7 +608,7 @@
 	   }
 	   
 	   Long newContentID = contentIDGenerator.getNextToolContentIDFor(tool);
-	   flashMessage = new FlashMessage("getToolContentID", newContentID);
+	   FlashMessage flashMessage = new FlashMessage("getToolContentID", newContentID);
 	   
 	   return flashMessage.serializeMessage();
 	}
@@ -667,8 +666,6 @@
 	public String generateUniqueContentFolder() throws FileUtilException, IOException {
 		
 		String newUniqueContentFolderID = null;
-		FlashMessage flashMessag = null;
-		
 		Properties props = new Properties();
 		
 		IdentifierGenerator uuidGen = new UUIDHexGenerator();
@@ -677,16 +674,17 @@
 		// lowercase to resolve OS issues
 		newUniqueContentFolderID = ((String) uuidGen.generate(null, null)).toLowerCase();
 		
-		flashMessage = new FlashMessage("createUniqueContentFolder", newUniqueContentFolderID);
+		FlashMessage flashMessage = new FlashMessage("createUniqueContentFolder", newUniqueContentFolderID);
 		
 		return flashMessage.serializeMessage();
 	}
 	
 	/** @see org.lamsfoundation.lams.authoring.service.IAuthoringService#getHelpURL() */
 	public String getHelpURL() throws Exception {
 		
-		String helpURL = Configuration.get(ConfigurationKeys.HELP_URL);
+		FlashMessage flashMessage =null;
 		
+		String helpURL = Configuration.get(ConfigurationKeys.HELP_URL);
 		if(helpURL != null)
 			flashMessage = new FlashMessage("getHelpURL", helpURL);
 		else 
Index: lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java,v
diff -u -r1.7 -r1.8
--- lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java	10 Oct 2006 05:17:36 -0000	1.7
+++ lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java	12 Jan 2007 05:03:03 -0000	1.8
@@ -56,9 +56,6 @@
 	private static Logger log = Logger.getLogger(StoreNBEntryServlet.class);
 	public static final String STORE_NBENTRY_MESSAGE_KEY = "storeNotebookEntry";
 	
-	/** for sending acknowledgment/error messages back to flash */
-	private FlashMessage flashMessage;
-
 	public ICoreNotebookService getNotebookService(){
 		WebApplicationContext webContext = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext());
 		return (ICoreNotebookService) webContext.getBean("coreNotebookService");		
@@ -81,7 +78,7 @@
 		{
 				
 		ICoreNotebookService notebookService = getNotebookService();
-		
+		FlashMessage flashMessage= null;
 
 		Hashtable table = (Hashtable)WDDXProcessor.deserialize(entryDetails);
 		NotebookEntry notebookEntry = new NotebookEntry();
Index: lams_central/src/java/org/lamsfoundation/lams/themes/web/ThemeAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/themes/web/ThemeAction.java,v
diff -u -r1.7 -r1.8
--- lams_central/src/java/org/lamsfoundation/lams/themes/web/ThemeAction.java	10 Oct 2006 23:48:50 -0000	1.7
+++ lams_central/src/java/org/lamsfoundation/lams/themes/web/ThemeAction.java	12 Jan 2007 05:03:03 -0000	1.8
@@ -74,9 +74,6 @@
 	
 	
 	
-	/** for sending acknowledgment/error messages back to flash */
-	private FlashMessage flashMessage;
-	
 	public IThemeService getThemeService(){
 		WebApplicationContext webContext = WebApplicationContextUtils.getRequiredWebApplicationContext(this.getServlet().getServletContext());
 		return (IThemeService) webContext.getBean(ThemeConstants.THEME_SERVICE_BEAN_NAME);		
@@ -157,7 +154,7 @@
 		IThemeService themeService = getThemeService();
 		MessageService messageService = themeService.getMessageService();
 		
-		flashMessage = null;
+		FlashMessage flashMessage= null;
 		
 		try {
 			if(type==null)