Fix various issues raised when adapting upper layers

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / auth / IdentLoginModule.java

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/IdentLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/IdentLoginModule.java
index ff741d8a05464588a27d33782b3bab852e77d968..f5e4085c32a97e456822e60877c99f8ef121b473 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/auth/IdentLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/IdentLoginModule.java
@@ -9,7 +9,6 @@ import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
-import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -43,7 +42,9 @@ public class IdentLoginModule implements LoginModule {
                } catch (UnsupportedCallbackException e) {
                        return false;
                }
-               HttpServletRequest request = httpCallback.getRequest();
+               HttpRequest request = httpCallback.getRequest();
+               if (request == null)
+                       return false;
                IdentClient identClient = Activator.getIdentClient(request.getRemoteAddr());
                if (identClient == null)
                        return false;