Skip to content

Commit 578c3dd

Browse files
committed
Polishing
(cherry picked from commit d6be433)
1 parent 9758bc7 commit 578c3dd

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,7 @@ project("spring-test") {
852852
optional("org.eclipse.persistence:javax.persistence:2.0.0")
853853
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
854854
optional("org.hamcrest:hamcrest-core:1.3")
855-
optional("com.jayway.jsonpath:json-path:0.9.0")
855+
optional("com.jayway.jsonpath:json-path:0.9.1")
856856
optional("xmlunit:xmlunit:1.5")
857857
testCompile(project(":spring-context-support"))
858858
testCompile(project(":spring-oxm"))

spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTransactionManager.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@
8181
* transaction. The DataSource that Hibernate uses needs to be JTA-enabled in
8282
* such a scenario (see container setup).
8383
*
84-
* <p>On JDBC 3.0, this transaction manager supports nested transactions via JDBC 3.0
85-
* Savepoints. The {@link #setNestedTransactionAllowed} "nestedTransactionAllowed"}
86-
* flag defaults to "false", though, as nested transactions will just apply to the
87-
* JDBC Connection, not to the Hibernate Session and its cached objects. You can
88-
* manually set the flag to "true" if you want to use nested transactions for
89-
* JDBC access code which participates in Hibernate transactions (provided that
84+
* <p>This transaction manager supports nested transactions via JDBC 3.0 Savepoints.
85+
* The {@link #setNestedTransactionAllowed} "nestedTransactionAllowed"} flag defaults
86+
* to "false", though, as nested transactions will just apply to the JDBC Connection,
87+
* not to the Hibernate Session and its cached entity objects and related context.
88+
* You can manually set the flag to "true" if you want to use nested transactions
89+
* for JDBC access code which participates in Hibernate transactions (provided that
9090
* your JDBC driver supports Savepoints). <i>Note that Hibernate itself does not
9191
* support nested transactions! Hence, do not expect Hibernate access code to
9292
* semantically participate in a nested transaction.</i>

spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@
100100
* special restrictions with EJB CMT and restrictive JTA subsystems: See
101101
* {@link org.springframework.transaction.jta.JtaTransactionManager}'s javadoc for details.
102102
*
103-
* <p>On JDBC 3.0, this transaction manager supports nested transactions via JDBC 3.0
104-
* Savepoints. The {@link #setNestedTransactionAllowed} "nestedTransactionAllowed"}
105-
* flag defaults to "false", though, as nested transactions will just apply to the
106-
* JDBC Connection, not to the Hibernate Session and its cached objects. You can
107-
* manually set the flag to "true" if you want to use nested transactions for
108-
* JDBC access code which participates in Hibernate transactions (provided that
103+
* <p>This transaction manager supports nested transactions via JDBC 3.0 Savepoints.
104+
* The {@link #setNestedTransactionAllowed} "nestedTransactionAllowed"} flag defaults
105+
* to "false", though, as nested transactions will just apply to the JDBC Connection,
106+
* not to the Hibernate Session and its cached entity objects and related context.
107+
* You can manually set the flag to "true" if you want to use nested transactions
108+
* for JDBC access code which participates in Hibernate transactions (provided that
109109
* your JDBC driver supports Savepoints). <i>Note that Hibernate itself does not
110110
* support nested transactions! Hence, do not expect Hibernate access code to
111111
* semantically participate in a nested transaction.</i>

spring-orm/src/main/java/org/springframework/orm/jdo/JdoTransactionManager.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@
7373
* that acts as "connectionFactory" of the PersistenceManagerFactory, so you usually
7474
* don't need to explicitly specify the "dataSource" property.
7575
*
76-
* <p>On JDBC 3.0, this transaction manager supports nested transactions via JDBC 3.0
77-
* Savepoints. The {@link #setNestedTransactionAllowed} "nestedTransactionAllowed"}
78-
* flag defaults to "false", though, as nested transactions will just apply to the
79-
* JDBC Connection, not to the JDO PersistenceManager and its cached objects.
76+
* <p>This transaction manager supports nested transactions via JDBC 3.0 Savepoints.
77+
* The {@link #setNestedTransactionAllowed} "nestedTransactionAllowed"} flag defaults
78+
* to "false", though, as nested transactions will just apply to the JDBC Connection,
79+
* not to the JDO PersistenceManager and its cached entity objects and related context.
8080
* You can manually set the flag to "true" if you want to use nested transactions
8181
* for JDBC access code which participates in JDO transactions (provided that your
8282
* JDBC driver supports Savepoints). <i>Note that JDO itself does not support

spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2013 the original author or authors.
2+
* Copyright 2002-2014 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.
@@ -85,10 +85,10 @@
8585
* used as known connection factory of the EntityManagerFactory, so you usually
8686
* don't need to explicitly specify the "dataSource" property.
8787
*
88-
* <p>On JDBC 3.0, this transaction manager supports nested transactions via JDBC 3.0
89-
* Savepoints. The {@link #setNestedTransactionAllowed} "nestedTransactionAllowed"}
90-
* flag defaults to "false", though, as nested transactions will just apply to the
91-
* JDBC Connection, not to the JPA EntityManager and its cached objects.
88+
* <p>This transaction manager supports nested transactions via JDBC 3.0 Savepoints.
89+
* The {@link #setNestedTransactionAllowed} "nestedTransactionAllowed"} flag defaults
90+
* to "false", though, as nested transactions will just apply to the JDBC Connection,
91+
* not to the JPA EntityManager and its cached entity objects and related context.
9292
* You can manually set the flag to "true" if you want to use nested transactions
9393
* for JDBC access code which participates in JPA transactions (provided that your
9494
* JDBC driver supports Savepoints). <i>Note that JPA itself does not support

0 commit comments

Comments
 (0)