From 43597bfed4281dc95e43ba989eccee9bfc3a4ea2 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 16 Oct 2014 17:26:10 +0200 Subject: [PATCH] Polishing --- .../incrementer/AbstractColumnMaxValueIncrementer.java | 4 ++-- .../incrementer/SybaseAnywhereMaxValueIncrementer.java | 3 ++- .../support/AbstractPlatformTransactionManager.java | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractColumnMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractColumnMaxValueIncrementer.java index 713d095a3f0..121eef0bae3 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractColumnMaxValueIncrementer.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractColumnMaxValueIncrementer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import org.springframework.util.Assert; /** * Abstract base class for {@link DataFieldMaxValueIncrementer} implementations that use * a column in a custom sequence table. Subclasses need to provide the specific handling - * of that table in their {@link #getNextKey()} implementation.. + * of that table in their {@link #getNextKey()} implementation. * * @author Juergen Hoeller * @since 2.5.3 diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.java index 726fdb5fa43..8f6a6ec0b5f 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.java @@ -31,7 +31,7 @@ import javax.sql.DataSource; * *

Example: * - *

 create table tab (id int not null primary key, text varchar(100))
+ * 
create table tab (id int not null primary key, text varchar(100))
  * create table tab_sequence (id bigint identity)
  * insert into tab_sequence values(DEFAULT)
* @@ -73,6 +73,7 @@ public class SybaseAnywhereMaxValueIncrementer extends SybaseMaxValueIncrementer super(dataSource, incrementerName, columnName); } + @Override protected String getIncrementStatement() { return "insert into " + getIncrementerName() + " values(DEFAULT)"; diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java index 693c43e0933..89a25afbdd9 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java @@ -361,7 +361,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran } else if (definition.getPropagationBehavior() == TransactionDefinition.PROPAGATION_REQUIRED || definition.getPropagationBehavior() == TransactionDefinition.PROPAGATION_REQUIRES_NEW || - definition.getPropagationBehavior() == TransactionDefinition.PROPAGATION_NESTED) { + definition.getPropagationBehavior() == TransactionDefinition.PROPAGATION_NESTED) { SuspendedResourcesHolder suspendedResources = suspend(null); if (debugEnabled) { logger.debug("Creating new transaction with name [" + definition.getName() + "]: " + definition); @@ -531,7 +531,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran if (status.isNewSynchronization()) { TransactionSynchronizationManager.setActualTransactionActive(status.hasTransaction()); TransactionSynchronizationManager.setCurrentTransactionIsolationLevel( - (definition.getIsolationLevel() != TransactionDefinition.ISOLATION_DEFAULT) ? + definition.getIsolationLevel() != TransactionDefinition.ISOLATION_DEFAULT ? definition.getIsolationLevel() : null); TransactionSynchronizationManager.setCurrentTransactionReadOnly(definition.isReadOnly()); TransactionSynchronizationManager.setCurrentTransactionName(definition.getName());