Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8323659: LinkedTransferQueue add and put methods call overridable offer #41

Merged
merged 1 commit into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,8 @@ public LinkedTransferQueue(Collection<? extends E> c) {
* @throws NullPointerException if the specified element is null
*/
public void put(E e) {
offer(e);
Objects.requireNonNull(e);
xfer(e, -1L);
}

/**
Expand All @@ -1156,7 +1157,9 @@ public void put(E e) {
* @throws NullPointerException if the specified element is null
*/
public boolean offer(E e, long timeout, TimeUnit unit) {
return offer(e);
Objects.requireNonNull(e);
xfer(e, -1L);
return true;
}

/**
Expand All @@ -1181,7 +1184,9 @@ public boolean offer(E e) {
* @throws NullPointerException if the specified element is null
*/
public boolean add(E e) {
return offer(e);
Objects.requireNonNull(e);
xfer(e, -1L);
return true;
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/*
* Copyright (c) 2024, 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 8323659
* @summary Ensures that the implementation of LTQ add and put methods does
* not call overridable offer. This test specifically asserts implementation
* details of LTQ. It's not that such impl details cannot change, just that
* such a change should be deliberately done with suitable consideration
* to compatibility.
* @run testng SubclassTest
*/

import java.util.concurrent.LinkedTransferQueue;
import java.util.concurrent.TimeUnit;
import org.testng.annotations.Test;
import static org.testng.Assert.assertEquals;

@Test
public class SubclassTest {

public void testPut() {
var queue = new TestLinkedTransferQueue();
queue.put(new Object());
assertEquals(queue.size(), 1);
}

public void testAdd() {
var queue = new TestLinkedTransferQueue();
queue.add(new Object());
assertEquals(queue.size(), 1);
}

public void testTimedOffer() {
var queue = new TestLinkedTransferQueue();
queue.offer(new Object(), 60, TimeUnit.SECONDS);
assertEquals(queue.size(), 1);
}

static class TestLinkedTransferQueue extends LinkedTransferQueue<Object> {
@Override
public boolean offer(Object obj) {
return false; // simulate fails to add the given obj
}
}
}
Loading