changeset 53:fc4c23247bb5

don't crash if admin user missing in config.
author casties
date Thu, 15 Nov 2012 15:05:34 +0100
parents a52c597075dc
children a8b9b2391ef3
files src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationsUiRestlet.java
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationsUiRestlet.java	Tue Nov 06 17:55:36 2012 +0100
+++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationsUiRestlet.java	Thu Nov 15 15:05:34 2012 +0100
@@ -60,7 +60,11 @@
         // get user name and password
         String user = serverConfig.getProperty(BaseRestlet.ADMIN_USER_KEY);
         String pw = serverConfig.getProperty(BaseRestlet.ADMIN_PASSWORD_KEY);
-        verifier.getLocalSecrets().put(user, pw.toCharArray());
+        if (user != null && pw != null) {
+            verifier.getLocalSecrets().put(user, pw.toCharArray());
+        } else {
+            logger.error("Admin user and password missing in serverconfig!");
+        }
         // Create a Guard
         ChallengeAuthenticator guard = new ChallengeAuthenticator(getContext(), ChallengeScheme.HTTP_BASIC, "Tutorial");
         guard.setVerifier(verifier);