Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java =================================================================== diff -u -r2579fb9a7e2c8581699bca77eb894f25e06eb249 -r0111fc3f9246760ad4b0287fe323e70e3f606468 --- lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java (.../PortfolioBuilder.java) (revision 2579fb9a7e2c8581699bca77eb894f25e06eb249) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java (.../PortfolioBuilder.java) (revision 0111fc3f9246760ad4b0287fe323e70e3f606468) @@ -51,6 +51,7 @@ import org.lamsfoundation.lams.tool.ToolSession; import org.lamsfoundation.lams.tool.service.ILamsCoreToolService; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; +import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.util.WebUtil; @@ -219,13 +220,14 @@ * Process all Notebook (Scratchpad) entries into portfolio objects. */ public void processNotebook() { - - List entries = coreNotebookService.getEntry(new Long(1),new Integer(1),"SCRATCHPAD", user.getUserId()); - Iterator it = entries.iterator(); - while(it.hasNext()) { - NotebookEntry entry = (NotebookEntry) it.next(); - NotebookPortfolio portfolio = createNotebookPortfolio(entry); - currentNotebookList.add(portfolio); + if(lesson != null && user != null) { + List entries = coreNotebookService.getEntry(lesson.getLessonId(),CoreNotebookConstants.SCRATCH_PAD,"SCRATCHPAD", user.getUserId()); + Iterator it = entries.iterator(); + while(it.hasNext()) { + NotebookEntry entry = (NotebookEntry) it.next(); + NotebookPortfolio portfolio = createNotebookPortfolio(entry); + currentNotebookList.add(portfolio); + } } }