From 33544baa4be9913b86d5cce2630efd78853a1e9a Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 30 Jan 2014 10:46:34 +0100
Subject: [PATCH] OO-956: check if there is something to clone
---
src/main/java/org/olat/NewControllerFactory.java | 5 ++++-
.../core/commons/controllers/resume/ResumeController.java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/NewControllerFactory.java b/src/main/java/org/olat/NewControllerFactory.java
index 9a2960af31b..2e3bca280f0 100644
--- a/src/main/java/org/olat/NewControllerFactory.java
+++ b/src/main/java/org/olat/NewControllerFactory.java
@@ -140,7 +140,10 @@ public class NewControllerFactory extends LogDelegator {
private ContextEntryControllerCreator getContextEntryControllerCreator(String type) {
ContextEntryControllerCreator typeHandler = contextEntryControllerCreators.get(type);
- return typeHandler.clone();
+ if(typeHandler != null) {
+ return typeHandler.clone();
+ }
+ return null;
}
/**
diff --git a/src/main/java/org/olat/core/commons/controllers/resume/ResumeController.java b/src/main/java/org/olat/core/commons/controllers/resume/ResumeController.java
index 5e6becf4a22..a9a40a3ccda 100644
--- a/src/main/java/org/olat/core/commons/controllers/resume/ResumeController.java
+++ b/src/main/java/org/olat/core/commons/controllers/resume/ResumeController.java
@@ -104,7 +104,7 @@ public class ResumeController extends FormBasicController implements SupportsAft
//make the resume secure. If something fail, don't generate a red screen
NewControllerFactory.getInstance().launch(ureq, bwControl);
} catch (Exception e) {
- logError("Error while resumging", e);
+ logError("Error while resuming", e);
}
}
return false;
--
GitLab