You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/03/05 16:14:55 UTC

[2/2] isis git commit: ISIS-1074: causedBy should be null when logging a LOGIN event to the SessionLoggingService.

ISIS-1074: causedBy should be null when logging a LOGIN event to the SessionLoggingService.


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e1285d66
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e1285d66
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e1285d66

Branch: refs/heads/master
Commit: e1285d66c2a224b74edad13a50c5a3fe7e34d761
Parents: 8cd1ce7
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Mar 5 15:12:58 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Mar 5 15:12:58 2015 +0000

----------------------------------------------------------------------
 .../integration/wicket/AuthenticatedWebSessionForIsis.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/e1285d66/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
index f98284d..05db776 100644
--- a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
+++ b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
@@ -77,7 +77,7 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
         authenticationRequest.setRoles(Arrays.asList(USER_ROLE));
         authenticationSession = getAuthenticationManager().authenticate(authenticationRequest);
         if (authenticationSession != null) {
-            log(SessionLoggingService.Type.LOGIN, username, SessionLoggingService.CausedBy.USER);
+            log(SessionLoggingService.Type.LOGIN, username, null);
             return true;
         } else {
             return false;
@@ -149,7 +149,10 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
         }
     }
 
-    private void log(final SessionLoggingService.Type type, final String username, final SessionLoggingService.CausedBy causedBy) {
+    private void log(
+            final SessionLoggingService.Type type,
+            final String username,
+            final SessionLoggingService.CausedBy causedBy) {
         final SessionLoggingService sessionLoggingService = getSessionLoggingService();
         if (sessionLoggingService != null) {
             IsisContext.doInSession(new Runnable() {