Return-Path: X-Original-To: apmail-deltaspike-commits-archive@www.apache.org Delivered-To: apmail-deltaspike-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C80E2190B1 for ; Fri, 22 Apr 2016 09:59:16 +0000 (UTC) Received: (qmail 85194 invoked by uid 500); 22 Apr 2016 09:59:16 -0000 Delivered-To: apmail-deltaspike-commits-archive@deltaspike.apache.org Received: (qmail 85165 invoked by uid 500); 22 Apr 2016 09:59:16 -0000 Mailing-List: contact commits-help@deltaspike.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltaspike.apache.org Delivered-To: mailing list commits@deltaspike.apache.org Received: (qmail 85154 invoked by uid 99); 22 Apr 2016 09:59:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Apr 2016 09:59:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 93F1CDFE60; Fri, 22 Apr 2016 09:59:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gpetracek@apache.org To: commits@deltaspike.apache.org Date: Fri, 22 Apr 2016 09:59:16 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] deltaspike git commit: DELTASPIKE-1131 improved MockHttpSession Repository: deltaspike Updated Branches: refs/heads/master a33015198 -> 8f9441fcb DELTASPIKE-1131 improved MockHttpSession Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/8f9441fc Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/8f9441fc Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/8f9441fc Branch: refs/heads/master Commit: 8f9441fcb8211c85e5bcb421d1f644415ef4460c Parents: 83dd59c Author: gpetracek Authored: Fri Apr 22 11:34:22 2016 +0200 Committer: gpetracek Committed: Fri Apr 22 11:57:54 2016 +0200 ---------------------------------------------------------------------- .../apache/deltaspike/cdise/owb/MockHttpSession.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8f9441fc/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java ---------------------------------------------------------------------- diff --git a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java index 8ce7dea..33b276d 100644 --- a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java +++ b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java @@ -19,6 +19,8 @@ package org.apache.deltaspike.cdise.owb; import java.util.Enumeration; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import javax.servlet.ServletContext; import javax.servlet.http.HttpSession; @@ -31,6 +33,8 @@ public class MockHttpSession implements HttpSession { private String sessionId; + private Map sessionMap = new ConcurrentHashMap(); + public MockHttpSession(String sessionId) { this.sessionId = sessionId; @@ -72,12 +76,12 @@ public class MockHttpSession implements HttpSession public Object getAttribute(String name) { - return null; + return this.sessionMap.get(name); } public Object getValue(String name) { - return null; + return getAttribute(name); } public Enumeration getAttributeNames() @@ -92,22 +96,27 @@ public class MockHttpSession implements HttpSession public void setAttribute(String name, Object value) { + this.sessionMap.put(name, value); } public void putValue(String name, Object value) { + setAttribute(name, value); } public void removeAttribute(String name) { + this.sessionMap.remove(name); } public void removeValue(String name) { + removeAttribute(name); } public void invalidate() { + this.sessionMap.clear(); } public boolean isNew()