Skip to content

Fixing the console warnings: No transaction in place, so not suspending. #1310

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
ashishvijaywargiya merged 3 commits into from
Jun 3, 2026
Merged

Fixing the console warnings: No transaction in place, so not suspending. #1310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58de0b2
Fixing the console warnings:
ashishvijaywargiya Jun 1, 2026
7e4a132
Merge branch 'apache:trunk' into test-integration-console-no-transact…
ashishvijaywargiya Jun 2, 2026
e116a43
Merge branch 'apache:trunk' into test-integration-console-no-transact…
ashishvijaywargiya Jun 2, 2026
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
4 changes: 3 additions & 1 deletion ...ccounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/paypal/PayPalServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,9 @@ public static Map<String, Object> payPalCheckoutUpdate(DispatchContext dctx, Map
boolean beganTransaction = false;
Transaction parentTransaction = null;
try {
parentTransaction = TransactionUtil.suspend();
if (TransactionUtil.isTransactionInPlace()) {
parentTransaction = TransactionUtil.suspend();
}
beganTransaction = TransactionUtil.begin();
} catch (GenericTransactionException e1) {
Debug.logError(e1, MODULE);
Expand Down
4 changes: 3 additions & 1 deletion applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5623,7 +5623,9 @@ public static Map<String, Object> callProcessOrderPayments(DispatchContext dctx,
Transaction trans = null;
try {
// disable transaction processing
trans = TransactionUtil.suspend();
if (TransactionUtil.isTransactionInPlace()) {
trans = TransactionUtil.suspend();
}

// get the cart
ShoppingCart cart = (ShoppingCart) context.get("shoppingCart");
Expand Down
4 changes: 3 additions & 1 deletion framework/common/src/main/java/org/apache/ofbiz/common/login/LdapAuthenticationServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,9 @@ public static boolean userLogin(DispatchContext ctx, Map<String, ?> context) {
boolean beganTransaction = false;
try {
try {
parentTx = TransactionUtil.suspend();
if (TransactionUtil.isTransactionInPlace()) {
parentTx = TransactionUtil.suspend();
}
} catch (GenericTransactionException e) {
Debug.logError(e, "Could not suspend transaction: " + e.getMessage(), MODULE);
}
Expand Down
4 changes: 3 additions & 1 deletion framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,9 @@ public static Map<String, Object> userLogin(DispatchContext ctx, Map<String, ?>

try {
try {
parentTx = TransactionUtil.suspend();
if (TransactionUtil.isTransactionInPlace()) {
parentTx = TransactionUtil.suspend();
}
} catch (GenericTransactionException e) {
Debug.logError(e, "Could not suspend transaction: " + e.getMessage(), MODULE);
}
Expand Down
4 changes: 3 additions & 1 deletion framework/entity/src/main/java/org/apache/ofbiz/entity/util/SequenceUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,9 @@ private void fillBank(long stagger) {

Transaction suspendedTransaction = null;
try {
suspendedTransaction = TransactionUtil.suspend();
if (TransactionUtil.isTransactionInPlace()) {
suspendedTransaction = TransactionUtil.suspend();
}

boolean beganTransaction = false;
try {
Expand Down
4 changes: 3 additions & 1 deletion framework/service/src/main/java/org/apache/ofbiz/service/GenericAbstractDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ public void schedule(String jobName, String poolName, String serviceName, Map<St
Transaction suspendedTransaction = null;
try {
boolean beganTransaction = false;
suspendedTransaction = TransactionUtil.suspend();
if (TransactionUtil.isTransactionInPlace()) {
suspendedTransaction = TransactionUtil.suspend();
}
try {
beganTransaction = TransactionUtil.begin();
try {
Expand Down
4 changes: 3 additions & 1 deletion framework/webapp/src/main/java/org/apache/ofbiz/webapp/OfbizPathShortener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,9 @@ private static boolean recordPathMapping(Delegator delegator, String path, Strin
Transaction trans = null;
try {
try {
trans = TransactionUtil.suspend();
if (TransactionUtil.isTransactionInPlace()) {
trans = TransactionUtil.suspend();
}
TransactionUtil.begin();
delegator.create("ShortenedPath", Map.of("shortenedPath", shortenedPath,
"originalPath", path,
Expand Down
4 changes: 3 additions & 1 deletion framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,9 @@ public static void setLoggedOut(String userLoginId, Delegator delegator) {

try {
try {
parentTx = TransactionUtil.suspend();
if (TransactionUtil.isTransactionInPlace()) {
parentTx = TransactionUtil.suspend();
}
} catch (GenericTransactionException e) {
Debug.logError(e, "Cannot suspend current transaction: " + e.getMessage(), MODULE);
}
Expand Down
Loading