Skip to content

Fix test bug in WebContainer Servlet 31 FAT CDIUpgradeHandlerTest #33616

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.

Sign up for GitHub

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

Merged
pmd1nh merged 2 commits into from
Dec 9, 2025
+12 −15
Merged

Fix test bug in WebContainer Servlet 31 FAT CDIUpgradeHandlerTest #33616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
607ed0a
Fix test bug in WebContainer Servlet 31 FAT CDIUpgradeHandlerTest
pmd1nh Dec 8, 2025
2718293
update copyright
pmd1nh Dec 8, 2025
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
11 changes: 6 additions & 5 deletions ...servlet_31_fat/cdi12testv2upgrade/war/cdi/upgrade/handlers/CDITestHttpUpgradeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014 IBM Corporation and others.
* Copyright (c) 2014, 2025 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package com.ibm.ws.webcontainer.servlet_31_fat.cdi12testv2upgrade.war.cdi.upgrade.handlers;

Expand Down Expand Up @@ -264,6 +261,10 @@ public void destroy() {

logBeanActivity(methodName, "Exit");

logInfo(methodName, "null out readListener [" + readListener + "] , writeListener [" + writeListener + "]");
readListener = null;
writeListener = null;

logExit(methodName);
}

Expand Down
8 changes: 3 additions & 5 deletions ...ainer/servlet_31_fat/cdi12testv2upgrade/war/cdi/upgrade/handlers/CDITestReadListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 IBM Corporation and others.
* Copyright (c) 2015, 2025 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package com.ibm.ws.webcontainer.servlet_31_fat.cdi12testv2upgrade.war.cdi.upgrade.handlers;

Expand Down Expand Up @@ -93,6 +90,7 @@ private void appendBeanData(String appendData) {
public void onDataAvailable() throws IOException {
String methodName = "onDataAvailable";
logEntry(methodName);
logInfo(methodName, "this [" + this + "]");

logBeanActivity(methodName, "Entry");
appendBeanData("RV"); // 'R' for "ReadListener"; 'V' for "Available"
Expand Down
8 changes: 3 additions & 5 deletions ...iner/servlet_31_fat/cdi12testv2upgrade/war/cdi/upgrade/handlers/CDITestWriteListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014, 2015 IBM Corporation and others.
* Copyright (c) 2014, 2025 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package com.ibm.ws.webcontainer.servlet_31_fat.cdi12testv2upgrade.war.cdi.upgrade.handlers;

Expand Down Expand Up @@ -96,6 +93,7 @@ private void appendBeanData(String appendData) {
public void onWritePossible() throws IOException {
String methodName = "onWritePossible";
logEntry(methodName);
logInfo(methodName, "this [" + this + "]");

logBeanActivity(methodName, "Entry");
appendBeanData("WP"); // 'W' for "WriteListener"; 'P' for "Possible"
Expand Down