ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject ignite git commit: IGNITE-3162: WebSession: Several JavaDoc improvements and additional assertions.
Date Tue, 28 Jun 2016 13:22:57 GMT
Repository: ignite
Updated Branches:
  refs/heads/master cbb77c9ad -> d03258ba3


IGNITE-3162: WebSession: Several JavaDoc improvements and additional assertions.


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

Branch: refs/heads/master
Commit: d03258ba366381f5b632d5f7dc5b3ef9aa7579ce
Parents: cbb77c9
Author: dkarachentsev <dkarachentsev@gridgain.com>
Authored: Tue Jun 28 16:22:51 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Tue Jun 28 16:22:51 2016 +0300

----------------------------------------------------------------------
 .../apache/ignite/cache/websession/WebSessionFilter.java  |  7 +++++--
 .../org/apache/ignite/cache/websession/WebSessionV2.java  | 10 ++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d03258ba/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
----------------------------------------------------------------------
diff --git a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
index b24bc36..7b822bf 100644
--- a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
+++ b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
@@ -694,8 +694,8 @@ public class WebSessionFilter implements Filter {
      * @return New session.
      */
     private WebSessionV2 createSessionV2(final HttpSession ses, final String sesId) throws
IOException {
-        if (log.isDebugEnabled())
-            log.debug("Session created: " + sesId);
+        assert ses != null;
+        assert sesId != null;
 
         WebSessionV2 cached = new WebSessionV2(sesId, ses, true, ctx, null, marshaller);
 
@@ -732,6 +732,9 @@ public class WebSessionFilter implements Filter {
 
         final String sesId = transformSessionId(ses.getId());
 
+        if (log.isDebugEnabled())
+            log.debug("Session created: " + sesId);
+
         return createSessionV2(ses, sesId);
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d03258ba/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionV2.java
----------------------------------------------------------------------
diff --git a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionV2.java
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionV2.java
index b6540b2..076130f 100644
--- a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionV2.java
+++ b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionV2.java
@@ -88,9 +88,15 @@ class WebSessionV2 implements HttpSession {
     private final HttpSession genuineSes;
 
     /**
+     * Constructs new web session.
+     *
      * @param id Session ID.
-     * @param ses Session.
-     * @param isNew Is new flag.
+     * @param ses Genuine session. Attributes will be copied from it and {@link #invalidate()}
+     *            action will be delegated to it.
+     * @param isNew Whether session is new.
+     * @param ctx Servlet context.
+     * @param entity Entity to be wrapped. If {@code null} passed new entity will be created.
+     * @param marshaller Grid marshaller.
      */
     WebSessionV2(final String id, final @Nullable HttpSession ses, final boolean isNew, final
ServletContext ctx,
         @Nullable WebSessionEntity entity, final Marshaller marshaller) {


Mime
View raw message