From 73abf1b634e7041f1e8fbf76e39ecd7d87b2f2c3 Mon Sep 17 00:00:00 2001
From: danielmerino <daniel.merino@unavarra.es>
Date: Wed, 2 Sep 2015 13:32:57 +0200
Subject: [PATCH] LSNBLDR-526 - Preventing a NPE in session when used from web
 service.

---
 .../lessonbuildertool/service/LessonBuilderEntityProducer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/LessonBuilderEntityProducer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/LessonBuilderEntityProducer.java
index 7ac612d6fc73..1455e1354068 100644
--- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/LessonBuilderEntityProducer.java
+++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/LessonBuilderEntityProducer.java
@@ -1323,7 +1323,7 @@ public Map<String,String> transferCopyEntitiesImpl(String fromContext, String to
 		    siteService.save(toSite);
 		    ToolSession session = sessionManager.getCurrentToolSession();
 
-		    if (session.getAttribute(ATTR_TOP_REFRESH) == null) {
+		    if (session != null && session.getAttribute(ATTR_TOP_REFRESH) == null) {
 			session.setAttribute(ATTR_TOP_REFRESH, Boolean.TRUE);
 		    }