diff options
Diffstat (limited to 'spring-tx/src')
5 files changed, 11 insertions, 7 deletions
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java index 5e3e2294..f0d8d733 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java @@ -29,8 +29,8 @@ import org.springframework.core.Ordered; /** * Enables Spring's annotation-driven transaction management capability, similar to * the support found in Spring's {@code <tx:*>} XML namespace. To be used on - * @{@link org.springframework.context.annotation.Configuration Configuration} classes - * as follows: + * {@link org.springframework.context.annotation.Configuration @Configuration} + * classes as follows: * * <pre class="code"> * @Configuration diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java index 1c7d4329..ac95aed8 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 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. @@ -32,7 +32,7 @@ import org.springframework.transaction.PlatformTransactionManager; * <p>Note that in by-type lookup disambiguation cases, an alternative approach to * implementing this interface is to simply mark one of the offending * {@code PlatformTransactionManager} {@code @Bean} methods as - * @{@link org.springframework.context.annotation.Primary Primary}. + * {@link org.springframework.context.annotation.Primary @Primary}. * This is even generally preferred since it doesn't lead to early initialization * of the {@code PlatformTransactionManager} bean. * diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/package-info.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/package-info.java index 7388259a..152819a3 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/package-info.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/package-info.java @@ -1,5 +1,5 @@ /** - * Java 5 annotation for transaction demarcation. + * Spring's support for annotation-based transaction demarcation. * Hooked into Spring's transaction interception infrastructure * via a special TransactionAttributeSource implementation. */ diff --git a/spring-tx/src/main/java/org/springframework/transaction/event/package-info.java b/spring-tx/src/main/java/org/springframework/transaction/event/package-info.java new file mode 100644 index 00000000..037c8e03 --- /dev/null +++ b/spring-tx/src/main/java/org/springframework/transaction/event/package-info.java @@ -0,0 +1,4 @@ +/** + * Spring's support for listening to transaction events. + */ +package org.springframework.transaction.event; diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java index 75151486..b2fd8ce0 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2016 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. @@ -142,7 +142,7 @@ public class TransactionTemplate extends DefaultTransactionDefinition rollbackOnException(status, err); throw err; } - catch (Exception ex) { + catch (Throwable ex) { // Transactional code threw unexpected exception -> rollback rollbackOnException(status, ex); throw new UndeclaredThrowableException(ex, "TransactionCallback threw undeclared checked exception"); |