Skip to content

Commit df60919

Browse files
committed
Polishing
1 parent 2f1f36e commit df60919

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/AbstractEmbeddedDatabaseConfigurer.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2019 the original author or authors.
2+
* Copyright 2002-2020 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.
@@ -57,9 +57,12 @@ public void shutdown(DataSource dataSource, String databaseName) {
5757
try {
5858
con.close();
5959
}
60-
catch (Throwable ex) {
60+
catch (SQLException ex) {
6161
logger.debug("Could not close JDBC Connection on shutdown", ex);
6262
}
63+
catch (Throwable ex) {
64+
logger.debug("Unexpected exception on closing JDBC Connection", ex);
65+
}
6366
}
6467
}
6568
}

spring-web/src/main/java/org/springframework/http/codec/json/Jackson2Tokenizer.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ private void raiseLimitException() {
229229
* @param objectMapper the current mapper instance
230230
* @param tokenizeArrays if {@code true} and the "top level" JSON object is
231231
* an array, each element is returned individually immediately after it is received
232-
* @param forceUseOfBigDecimal if {@code true}, any floating point values encountered in source will use
233-
* {@link java.math.BigDecimal}
232+
* @param forceUseOfBigDecimal if {@code true}, any floating point values encountered
233+
* in source will use {@link java.math.BigDecimal}
234234
* @param maxInMemorySize maximum memory size
235235
* @return the resulting token buffers
236236
*/
@@ -244,8 +244,8 @@ public static Flux<TokenBuffer> tokenize(Flux<DataBuffer> dataBuffers, JsonFacto
244244
context = ((DefaultDeserializationContext) context).createInstance(
245245
objectMapper.getDeserializationConfig(), parser, objectMapper.getInjectableValues());
246246
}
247-
Jackson2Tokenizer tokenizer = new Jackson2Tokenizer(parser, context, tokenizeArrays, forceUseOfBigDecimal,
248-
maxInMemorySize);
247+
Jackson2Tokenizer tokenizer =
248+
new Jackson2Tokenizer(parser, context, tokenizeArrays, forceUseOfBigDecimal, maxInMemorySize);
249249
return dataBuffers.flatMap(tokenizer::tokenize, Flux::error, tokenizer::endOfInput);
250250
}
251251
catch (IOException ex) {

0 commit comments

Comments
 (0)