Skip to content
Snippets Groups Projects
Commit 2951e5fb authored by Daniel Gerhardt's avatar Daniel Gerhardt
Browse files

Fix NPE on session import with data from ARSnova < 2.4

Fixes a regression introduced with commit
d74ef999.

Refs arsnova/arsnova#85
Refs !25
parent 9f7e2204
Branches
Tags
No related merge requests found
......@@ -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());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment