Mercurial > hg > openjdk > icedtea > jdk7 > jdk
changeset 5470:e9b5b26b670e
6953455: CookieStore.add() cannot handle null URI parameter, contrary to the API
Reviewed-by: chegar, mduigou
Contributed-by: kurchi.subhra.hazra@oracle.com
author | ngmr |
---|---|
date | Tue, 10 Jul 2012 14:46:45 +0100 |
parents | c85fa4a6df4e |
children | 6887986f0dfc |
files | src/share/classes/java/net/InMemoryCookieStore.java test/java/net/CookieHandler/NullUriCookieTest.java |
diffstat | 2 files changed, 84 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/net/InMemoryCookieStore.java Fri Jul 06 13:37:10 2012 +0400 +++ b/src/share/classes/java/net/InMemoryCookieStore.java Tue Jul 10 14:46:45 2012 +0100 @@ -91,8 +91,10 @@ if (cookie.getDomain() != null) { addIndex(domainIndex, cookie.getDomain(), cookie); } - // add it to uri index, too - addIndex(uriIndex, getEffectiveURI(uri), cookie); + if (uri != null) { + // add it to uri index, too + addIndex(uriIndex, getEffectiveURI(uri), cookie); + } } } finally { lock.unlock();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/net/CookieHandler/NullUriCookieTest.java Tue Jul 10 14:46:45 2012 +0100 @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 6953455 + * @summary CookieStore.add() cannot handle null URI parameter + */ + +import java.net.CookieManager; +import java.net.CookieStore; +import java.net.HttpCookie; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; + +public class NullUriCookieTest { + static boolean fail = false; + + public static void main(String[] args) throws Exception { + checkCookieNullUri(); + } + + static void checkCookieNullUri() throws Exception { + //get a cookie store implementation and add a cookie to the store with null URI + CookieStore cookieStore = (new CookieManager()).getCookieStore(); + HttpCookie cookie = new HttpCookie("MY_COOKIE", "MY_COOKIE_VALUE"); + cookie.setDomain("foo.com"); + cookieStore.add(null, cookie); + + //Retrieve added cookie + URI uri = new URI("http://foo.com"); + List<HttpCookie> addedCookieList = cookieStore.get(uri); + + //Verify CookieStore behaves well + if (addedCookieList.size() != 1) { + fail = true; + } + checkFail("Abnormal size of cookie jar"); + + for (HttpCookie chip : addedCookieList) { + if (!chip.equals(cookie)) { + fail = true; + } + } + checkFail("Cookie not retrieved from Cookie Jar"); + boolean ret = cookieStore.remove(null,cookie); + if (!ret) { + fail = true; + } + checkFail("Abnormal removal behaviour from Cookie Jar"); + } + + static void checkFail(String exp) { + if (fail) { + throw new RuntimeException(exp); + } + } +} +