From c6bc2ed875b811df4f7919967015d7ef1ddd87bc Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Mon, 23 Oct 2017 15:47:02 +0200
Subject: [PATCH] Fix NPE on session import with data from ARSnova < 2.4
Fixes a regression introduced with commit
d74ef999b8e3941a5405910f36af5cb5bf09d16e.
Fixes arsnova/arsnova#85
Refs !25
---
.../transport/ImportExportSession.java | 26 ++++++++++---------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/entities/transport/ImportExportSession.java b/src/main/java/de/thm/arsnova/entities/transport/ImportExportSession.java
index 02a01e975..7cbfce052 100644
--- a/src/main/java/de/thm/arsnova/entities/transport/ImportExportSession.java
+++ b/src/main/java/de/thm/arsnova/entities/transport/ImportExportSession.java
@@ -129,21 +129,23 @@ public class ImportExportSession {
// import fields
s.setActive(session.isActive());
// overwrite name and shortname
- s.setName(session.getPublicPool().getName());
- s.setShortName(session.getPublicPool().getShortName());
+ s.setName(session.getName());
+ s.setShortName(session.getShortName());
// mark as public pool session
s.setSessionType(session.getSessionType());
s.setFeatures(session.getSessionFeature());
- // set pool fields (which are also used as a session info)
- s.setPpAuthorMail(session.getPublicPool().getPpAuthorMail());
- s.setPpAuthorName(session.getPublicPool().getPpAuthorName());
- s.setPpDescription(session.getPublicPool().getPpDescription());
- s.setPpFaculty(session.getPublicPool().getPpFaculty());
- s.setPpLevel(session.getPublicPool().getPpLevel());
- s.setPpLicense(session.getPublicPool().getPpLicense());
- s.setPpLogo(session.getPublicPool().getPpLogo());
- s.setPpSubject(session.getPublicPool().getPpSubject());
- s.setPpUniversity(session.getPublicPool().getPpUniversity());
+ if (session.getPublicPool() != null) {
+ // set pool fields (which are also used as a session info)
+ s.setPpAuthorMail(session.getPublicPool().getPpAuthorMail());
+ s.setPpAuthorName(session.getPublicPool().getPpAuthorName());
+ s.setPpDescription(session.getPublicPool().getPpDescription());
+ s.setPpFaculty(session.getPublicPool().getPpFaculty());
+ s.setPpLevel(session.getPublicPool().getPpLevel());
+ s.setPpLicense(session.getPublicPool().getPpLicense());
+ s.setPpLogo(session.getPublicPool().getPpLogo());
+ s.setPpSubject(session.getPublicPool().getPpSubject());
+ s.setPpUniversity(session.getPublicPool().getPpUniversity());
+ }
// other fields
s.setType("session");
s.setCreator(user.getUsername());
--
GitLab