Skip to content

Revert "Defend against intermittent EJB failures" committed and merged in #2396 without correct process #2397

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

Open
wants to merge 1 commit into
base: 10.0.x
Choose a base branch
from
Open

Revert "Defend against intermittent EJB failures" committed and merged in #2396 without correct process #2397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions src/com/sun/ts/tests/ejb30/common/lite/EJBLiteClientBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
Expand Down Expand Up @@ -377,9 +375,6 @@ protected StringBuilder getReasonBuffer() {

protected void appendReason(Object... oo) {
for (Object o : oo) {
if (o instanceof Collection<?>) {
o = new ArrayList<>((Collection<?>) o); // Copy to prevent ConcurrentModificationException
}
getReasonBuffer().append(o).append(System.getProperty("line.separator"));
}
}
Expand Down
5 changes: 0 additions & 5 deletions src/com/sun/ts/tests/ejb30/common/lite/EJBLiteJsfClientBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
Expand Down Expand Up @@ -381,9 +379,6 @@ protected StringBuilder getReasonBuffer() {

protected void appendReason(Object... oo) {
for (Object o : oo) {
if (o instanceof Collection<?>) {
o = new ArrayList<>((Collection<?>) o); // Copy to prevent ConcurrentModificationException
}
getReasonBuffer().append(o).append(System.getProperty("line.separator"));
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/com/sun/ts/tests/ejb30/timer/common/TimerUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ public static Timer createSecondLaterTimer(TimerService timerService,

public static Timer createSecondLaterTimer(TimerService timerService,
TimerConfig timerConfig) {
return createSecondLaterTimer(timerService, timerConfig, 2);
return createSecondLaterTimer(timerService, timerConfig, 1);
}

public static Timer createSecondLaterTimer(TimerService timerService,
Expand All @@ -284,7 +284,7 @@ public static Timer createSecondLaterTimer(TimerService timerService,

public static Timer createSecondLaterTimer(TimerService timerService,
TimerInfo info) {
return createSecondLaterTimer(timerService, info, 2);
return createSecondLaterTimer(timerService, info, 1);
}

public static Timer createSecondLaterTimer(TimerService timerService,
Expand Down