root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Simplify if statements and replace try-finally with try-with-resources 

Closes gh-23445
This commit is contained in:
zhuzhuman978 2019-08-10 20:03:18 +08:00 committed by Sam Brannen
parent fabdb07e53
commit 849bbf00b5
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java
View File

@ -64,22 +64,19 @@ abstract class AbstractStaxXMLReader extends AbstractXMLReader {
@Override
public boolean getFeature(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
if (NAMESPACES_FEATURE_NAME.equals(name)) {
return this.namespacesFeature;
}
else if (NAMESPACE_PREFIXES_FEATURE_NAME.equals(name)) {
return this.namespacePrefixesFeature;
}
else if (IS_STANDALONE_FEATURE_NAME.equals(name)) {
if (this.isStandalone != null) {
return this.isStandalone;
}
else {
throw new SAXNotSupportedException("startDocument() callback not completed yet");
}
}
else {
return super.getFeature(name);
switch (name) {
case NAMESPACES_FEATURE_NAME:
return this.namespacesFeature;
case NAMESPACE_PREFIXES_FEATURE_NAME:
return this.namespacePrefixesFeature;
case IS_STANDALONE_FEATURE_NAME:
if (this.isStandalone != null) {
return this.isStandalone;
} else {
throw new SAXNotSupportedException("startDocument() callback not completed yet");
}
default:
return super.getFeature(name);
}
}

6
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java
View File

@ -408,13 +408,9 @@ public class DataSourceTransactionManager extends AbstractPlatformTransactionMan
throws SQLException {
if (isEnforceReadOnly() && definition.isReadOnly()) {
Statement stmt = con.createStatement();
try {
try (Statement stmt = con.createStatement()) {
stmt.executeUpdate("SET TRANSACTION READ ONLY");
}
finally {
stmt.close();
}
}
}