diff options
author | Simon Rettberg | 2015-08-11 17:47:31 +0200 |
---|---|---|
committer | Simon Rettberg | 2015-08-11 17:47:31 +0200 |
commit | 1c73e0ff9656530503317cfb07de19716e3e868a (patch) | |
tree | f1c6ff2b6e39bb48250babf01aed761ca59186ef /dozentenmodulserver/src/main | |
parent | [client] Fix/finish download feature (no visual feedback yet) (diff) | |
download | tutor-module-1c73e0ff9656530503317cfb07de19716e3e868a.tar.gz tutor-module-1c73e0ff9656530503317cfb07de19716e3e868a.tar.xz tutor-module-1c73e0ff9656530503317cfb07de19716e3e868a.zip |
[server] Don't try to deserialize null
Diffstat (limited to 'dozentenmodulserver/src/main')
-rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java index 106773f4..efd9f78b 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java @@ -55,7 +55,7 @@ public class DbLecture { stmt.setBoolean("canedit", lecture.defaultPermissions.edit); stmt.setBoolean("canadmin", lecture.defaultPermissions.admin); stmt.executeUpdate(); - update(connection, user, lectureId, lecture); + update(connection, user, lectureId, lecture); // TODO: WTF connection.commit(); return lectureId; } catch (SQLException e) { @@ -104,7 +104,12 @@ public class DbLecture { lecture.nics.remove(0); } } - String netruleJson = Json.serialize(lecture.networkExceptions); + String netruleJson; + if (lecture.networkExceptions == null) { + netruleJson = null; + } else { + netruleJson = Json.serialize(lecture.networkExceptions); + } MysqlStatement stmt = connection.prepareStatement("UPDATE lecture SET " + " displayname = :displayname, description = :description, imageversionid = :imageversionid," + " autoupdate = :autoupdate, isenabled = :isenabled, starttime = :starttime," @@ -248,8 +253,10 @@ public class DbLecture { String netrules = rs.getString("netrules"); if (netrules != null) { try { - lecture.setNetworkExceptions(Arrays.asList(Json.deserializeThrift(netrules, - NetRule[].class))); + NetRule[] rules = Json.deserializeThrift(netrules, NetRule[].class); + if (rules != null) { + lecture.setNetworkExceptions(Arrays.asList(rules)); + } } catch (JsonParseException e) { LOGGER.warn("Could not deserialize netrules for lecture " + lectureId, e); } |