Skip to content

Commit 3d6476d

Browse files
committed
Polishing
1 parent a7949ac commit 3d6476d

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2018 the original author or authors.
2+
* Copyright 2002-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -287,7 +287,8 @@ protected Object invokeWithinTransaction(Method method, @Nullable Class<?> targe
287287
if (txAttr == null || !(tm instanceof CallbackPreferringPlatformTransactionManager)) {
288288
// Standard transaction demarcation with getTransaction and commit/rollback calls.
289289
TransactionInfo txInfo = createTransactionIfNecessary(tm, txAttr, joinpointIdentification);
290-
Object retVal = null;
290+
291+
Object retVal;
291292
try {
292293
// This is an around advice: Invoke the next interceptor in the chain.
293294
// This will normally result in a target object being invoked.
@@ -508,8 +509,8 @@ protected TransactionInfo prepareTransactionInfo(@Nullable PlatformTransactionMa
508509
// The TransactionInfo.hasTransaction() method will return false. We created it only
509510
// to preserve the integrity of the ThreadLocal stack maintained in this class.
510511
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.");
513514
}
514515
}
515516

@@ -592,7 +593,7 @@ protected void cleanupTransactionInfo(@Nullable TransactionInfo txInfo) {
592593

593594

594595
/**
595-
* Opaque object used to hold Transaction information. Subclasses
596+
* Opaque object used to hold transaction information. Subclasses
596597
* must pass it back to methods on this class, but not see its internals.
597598
*/
598599
protected final class TransactionInfo {

spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeStrategies.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public interface ExchangeStrategies {
5151
// Static builder methods
5252

5353
/**
54-
* Return a new {@code ExchangeStrategies} with default configuration
54+
* Return an {@code ExchangeStrategies} instance with default configuration
5555
* provided by {@link ClientCodecConfigurer}.
5656
*/
5757
static ExchangeStrategies withDefaults() {

0 commit comments

Comments
 (0)