diff --git a/findbugs-excludes.xml b/findbugs-excludes.xml index 541e2178..39d597dd 100644 --- a/findbugs-excludes.xml +++ b/findbugs-excludes.xml @@ -24,7 +24,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Indicator.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Indicator.java index c0b2c8cf..280a949e 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Indicator.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Indicator.java @@ -38,7 +38,7 @@ public final class Indicator implements Entity { ; public final String name; - public boolean integerValue; + public final boolean integerValue; private IndicatorType(final String name, final boolean integerValue) { this.name = name; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/InstitutionalAuthenticationEntryPoint.java b/src/main/java/ch/ethz/seb/sebserver/gui/InstitutionalAuthenticationEntryPoint.java index 2f87130c..d3ed1d03 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/InstitutionalAuthenticationEntryPoint.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/InstitutionalAuthenticationEntryPoint.java @@ -85,6 +85,9 @@ final class InstitutionalAuthenticationEntryPoint implements AuthenticationEntry _defaultLogo = FileCopyUtils.copyToString(reader); + } catch (final IOException e) { + log.warn("Failed to load default logo image from filesystem: {}", defaultLogoFileName); + _defaultLogo = null; } catch (final Exception e) { log.warn("Failed to load default logo image from filesystem: {}", defaultLogoFileName); _defaultLogo = null; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/activity/ActivitiesPane.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/activity/ActivitiesPane.java index 9909e346..7bdbdc17 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/activity/ActivitiesPane.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/activity/ActivitiesPane.java @@ -315,7 +315,12 @@ public class ActivitiesPane implements TemplateComposer { .create()); } - monitoring.setExpanded(this.currentUser.get().hasAnyRole(UserRole.EXAM_SUPPORTER)); + if (monitoring != null) { + monitoring.setExpanded( + this.currentUser + .get() + .hasAnyRole(UserRole.EXAM_SUPPORTER)); + } } // ---- MONITORING ---------------------------------------------------------------------