Skip to content
Snippets Groups Projects
Commit c6bc2ed8 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.

Fixes arsnova#85
Refs !25
parent 9f7e2204
No related merge requests found
Pipeline #10288 passed with stages
in 2 minutes and 33 seconds
...@@ -129,21 +129,23 @@ public class ImportExportSession { ...@@ -129,21 +129,23 @@ public class ImportExportSession {
// import fields // import fields
s.setActive(session.isActive()); s.setActive(session.isActive());
// overwrite name and shortname // overwrite name and shortname
s.setName(session.getPublicPool().getName()); s.setName(session.getName());
s.setShortName(session.getPublicPool().getShortName()); s.setShortName(session.getShortName());
// mark as public pool session // mark as public pool session
s.setSessionType(session.getSessionType()); s.setSessionType(session.getSessionType());
s.setFeatures(session.getSessionFeature()); s.setFeatures(session.getSessionFeature());
// set pool fields (which are also used as a session info) if (session.getPublicPool() != null) {
s.setPpAuthorMail(session.getPublicPool().getPpAuthorMail()); // set pool fields (which are also used as a session info)
s.setPpAuthorName(session.getPublicPool().getPpAuthorName()); s.setPpAuthorMail(session.getPublicPool().getPpAuthorMail());
s.setPpDescription(session.getPublicPool().getPpDescription()); s.setPpAuthorName(session.getPublicPool().getPpAuthorName());
s.setPpFaculty(session.getPublicPool().getPpFaculty()); s.setPpDescription(session.getPublicPool().getPpDescription());
s.setPpLevel(session.getPublicPool().getPpLevel()); s.setPpFaculty(session.getPublicPool().getPpFaculty());
s.setPpLicense(session.getPublicPool().getPpLicense()); s.setPpLevel(session.getPublicPool().getPpLevel());
s.setPpLogo(session.getPublicPool().getPpLogo()); s.setPpLicense(session.getPublicPool().getPpLicense());
s.setPpSubject(session.getPublicPool().getPpSubject()); s.setPpLogo(session.getPublicPool().getPpLogo());
s.setPpUniversity(session.getPublicPool().getPpUniversity()); s.setPpSubject(session.getPublicPool().getPpSubject());
s.setPpUniversity(session.getPublicPool().getPpUniversity());
}
// other fields // other fields
s.setType("session"); s.setType("session");
s.setCreator(user.getUsername()); 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