Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java,v
diff -u -r1.4 -r1.5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java	26 Sep 2006 05:53:05 -0000	1.4
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java	26 Sep 2006 06:30:27 -0000	1.5
@@ -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);
+			}
 		}
 	}