summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
diff options
context:
space:
mode:
authorJonathan Bauer2015-09-02 13:56:25 +0200
committerJonathan Bauer2015-09-02 13:56:25 +0200
commitc3366ab20b4010e564023bcceaaf4c66f658e0b7 (patch)
treeb5991242d3ad4d694c9f2d9ee9d410ef239152b9 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
parent[server] Serve vmchooser-compatible lecture list via http (diff)
downloadtutor-module-c3366ab20b4010e564023bcceaaf4c66f658e0b7.tar.gz
tutor-module-c3366ab20b4010e564023bcceaaf4c66f658e0b7.tar.xz
tutor-module-c3366ab20b4010e564023bcceaaf4c66f658e0b7.zip
[client] LoginWindow: fix Shibboleth login throwing a NPE when no IDP was selected (happens when no config file is found by default)
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
index 8c9d32b6..6340c377 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
@@ -238,10 +238,16 @@ public class LoginWindow extends LoginWindowLayout {
private void doLogin() {
// sanity check on loginType.
if (loginType == null) {
- Gui.showMessageBox(this, "No login type set, a default should be set! Ignoring...",
+ Gui.showMessageBox(this, "Bitte wählen Sie eine Authentifizierungsart.",
MessageType.ERROR, LOGGER, null);
return;
}
+ if (idpCombo.getSelectedIndex() == -1) {
+ Gui.showMessageBox(this, "Bitte wählen Sie ihre Organisation als 'Identity Provider'.",
+ MessageType.ERROR, LOGGER, null);
+ idpCombo.requestFocus();
+ return;
+ }
// we are doing the login soon, first save the config
doSaveConfig();
// here we only check for the fields