Merge branch 'develop' into feature/exclude-object-class
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/08b44fda Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/08b44fda Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/08b44fda Branch: refs/heads/feature/exclude-object-class Commit: 08b44fdad666c78e4a7a96c57bbe896eff896829 Parents: 7857b86 63897e8 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Thu May 8 22:07:22 2014 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Thu May 8 22:07:22 2014 +0200 ---------------------------------------------------------------------- .../struts2/interceptor/CookieInterceptor.java | 45 +++++++++++------ .../interceptor/CookieInterceptorTest.java | 53 ++++++++++++++++++++ 2 files changed, 82 insertions(+), 16 deletions(-) ----------------------------------------------------------------------