|
1 | 1 | /*
|
2 |
| - * Copyright 2002-2018 the original author or authors. |
| 2 | + * Copyright 2002-2019 the original author or authors. |
3 | 3 | *
|
4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License");
|
5 | 5 | * you may not use this file except in compliance with the License.
|
@@ -287,7 +287,8 @@ protected Object invokeWithinTransaction(Method method, @Nullable Class<?> targe
|
287 | 287 | if (txAttr == null || !(tm instanceof CallbackPreferringPlatformTransactionManager)) {
|
288 | 288 | // Standard transaction demarcation with getTransaction and commit/rollback calls.
|
289 | 289 | TransactionInfo txInfo = createTransactionIfNecessary(tm, txAttr, joinpointIdentification);
|
290 |
| - Object retVal = null; |
| 290 | + |
| 291 | + Object retVal; |
291 | 292 | try {
|
292 | 293 | // This is an around advice: Invoke the next interceptor in the chain.
|
293 | 294 | // This will normally result in a target object being invoked.
|
@@ -508,8 +509,8 @@ protected TransactionInfo prepareTransactionInfo(@Nullable PlatformTransactionMa
|
508 | 509 | // The TransactionInfo.hasTransaction() method will return false. We created it only
|
509 | 510 | // to preserve the integrity of the ThreadLocal stack maintained in this class.
|
510 | 511 | if (logger.isTraceEnabled()) {
|
511 |
| - logger.trace("Don't need to create transaction for [" + joinpointIdentification + |
512 |
| - "]: This method isn't transactional."); |
| 512 | + logger.trace("No need to create transaction for [" + joinpointIdentification + |
| 513 | + "]: This method is not transactional."); |
513 | 514 | }
|
514 | 515 | }
|
515 | 516 |
|
@@ -592,7 +593,7 @@ protected void cleanupTransactionInfo(@Nullable TransactionInfo txInfo) {
|
592 | 593 |
|
593 | 594 |
|
594 | 595 | /**
|
595 |
| - * Opaque object used to hold Transaction information. Subclasses |
| 596 | + * Opaque object used to hold transaction information. Subclasses |
596 | 597 | * must pass it back to methods on this class, but not see its internals.
|
597 | 598 | */
|
598 | 599 | protected final class TransactionInfo {
|
|
0 commit comments