Browse Source

Polishing

pull/26383/head
Juergen Hoeller 6 years ago
parent
commit
df60919bb0
  1. 7
      spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/AbstractEmbeddedDatabaseConfigurer.java
  2. 8
      spring-web/src/main/java/org/springframework/http/codec/json/Jackson2Tokenizer.java

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -57,9 +57,12 @@ abstract class AbstractEmbeddedDatabaseConfigurer implements EmbeddedDatabaseCon
try { try {
con.close(); con.close();
} }
catch (Throwable ex) { catch (SQLException ex) {
logger.debug("Could not close JDBC Connection on shutdown", ex); logger.debug("Could not close JDBC Connection on shutdown", ex);
} }
catch (Throwable ex) {
logger.debug("Unexpected exception on closing JDBC Connection", ex);
}
} }
} }
} }

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

@ -229,8 +229,8 @@ final class Jackson2Tokenizer {
* @param objectMapper the current mapper instance * @param objectMapper the current mapper instance
* @param tokenizeArrays if {@code true} and the "top level" JSON object is * @param tokenizeArrays if {@code true} and the "top level" JSON object is
* an array, each element is returned individually immediately after it is received * an array, each element is returned individually immediately after it is received
* @param forceUseOfBigDecimal if {@code true}, any floating point values encountered in source will use * @param forceUseOfBigDecimal if {@code true}, any floating point values encountered
* {@link java.math.BigDecimal} * in source will use {@link java.math.BigDecimal}
* @param maxInMemorySize maximum memory size * @param maxInMemorySize maximum memory size
* @return the resulting token buffers * @return the resulting token buffers
*/ */
@ -244,8 +244,8 @@ final class Jackson2Tokenizer {
context = ((DefaultDeserializationContext) context).createInstance( context = ((DefaultDeserializationContext) context).createInstance(
objectMapper.getDeserializationConfig(), parser, objectMapper.getInjectableValues()); objectMapper.getDeserializationConfig(), parser, objectMapper.getInjectableValues());
} }
Jackson2Tokenizer tokenizer = new Jackson2Tokenizer(parser, context, tokenizeArrays, forceUseOfBigDecimal, Jackson2Tokenizer tokenizer =
maxInMemorySize); new Jackson2Tokenizer(parser, context, tokenizeArrays, forceUseOfBigDecimal, maxInMemorySize);
return dataBuffers.flatMap(tokenizer::tokenize, Flux::error, tokenizer::endOfInput); return dataBuffers.flatMap(tokenizer::tokenize, Flux::error, tokenizer::endOfInput);
} }
catch (IOException ex) { catch (IOException ex) {

Loading…
Cancel
Save