@ -35,7 +35,7 @@ public class ServiceListFactoryBean extends AbstractServiceLoaderBasedFactoryBea
@@ -35,7 +35,7 @@ public class ServiceListFactoryBean extends AbstractServiceLoaderBasedFactoryBea
@ -62,7 +62,8 @@ public class TimerManagerFactoryBean extends TimerManagerAccessor
@@ -62,7 +62,8 @@ public class TimerManagerFactoryBean extends TimerManagerAccessor
@ -87,6 +88,7 @@ public class TimerManagerFactoryBean extends TimerManagerAccessor
@@ -87,6 +88,7 @@ public class TimerManagerFactoryBean extends TimerManagerAccessor
@ -144,15 +146,17 @@ public class TimerManagerFactoryBean extends TimerManagerAccessor
@@ -144,15 +146,17 @@ public class TimerManagerFactoryBean extends TimerManagerAccessor
@Override
publicvoiddestroy(){
// Cancel all registered timers.
for(Timertimer:this.timers){
try{
timer.cancel();
}
catch(Throwableex){
logger.debug("Could not cancel CommonJ Timer",ex);
if(this.timers!=null){
for(Timertimer:this.timers){
try{
timer.cancel();
}
catch(Throwableex){
logger.debug("Could not cancel CommonJ Timer",ex);
@ -403,7 +402,7 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
@@ -403,7 +402,7 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
@ -93,9 +93,9 @@ public class ClassPathScanningCandidateComponentProvider implements EnvironmentC
@@ -93,9 +93,9 @@ public class ClassPathScanningCandidateComponentProvider implements EnvironmentC
@ -55,7 +55,7 @@ public class ShadowingClassLoader extends DecoratingClassLoader {
@@ -55,7 +55,7 @@ public class ShadowingClassLoader extends DecoratingClassLoader {
@ -50,7 +50,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
@@ -50,7 +50,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
@ -145,7 +145,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
@@ -145,7 +145,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
@Override
publicList<ObjectError>getGlobalErrors(){
List<ObjectError>result=newLinkedList<>();
List<ObjectError>result=newArrayList<>();
for(ObjectErrorobjectError:this.errors){
if(!(objectErrorinstanceofFieldError)){
result.add(objectError);
@ -167,7 +167,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
@@ -167,7 +167,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
@Override
publicList<FieldError>getFieldErrors(){
List<FieldError>result=newLinkedList<>();
List<FieldError>result=newArrayList<>();
for(ObjectErrorobjectError:this.errors){
if(objectErrorinstanceofFieldError){
result.add((FieldError)objectError);
@ -189,7 +189,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
@@ -189,7 +189,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
@ -651,7 +652,7 @@ public class GenericConversionService implements ConfigurableConversionService {
@@ -651,7 +652,7 @@ public class GenericConversionService implements ConfigurableConversionService {
@ -50,7 +51,7 @@ public class FastByteArrayOutputStream extends OutputStream {
@@ -50,7 +51,7 @@ public class FastByteArrayOutputStream extends OutputStream {
@ -94,7 +95,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
@@ -94,7 +95,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
@ -186,7 +187,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
@@ -186,7 +187,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
@ -216,7 +217,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
@@ -216,7 +217,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
@ -247,7 +248,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
@@ -247,7 +248,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
@ -268,7 +269,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
@@ -268,7 +269,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
@ -276,7 +277,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
@@ -276,7 +277,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
@ -58,11 +59,11 @@ public class JmsResourceHolder extends ResourceHolderSupport {
@@ -58,11 +59,11 @@ public class JmsResourceHolder extends ResourceHolderSupport {
@ -155,8 +156,8 @@ public class JmsResourceHolder extends ResourceHolderSupport {
@@ -155,8 +156,8 @@ public class JmsResourceHolder extends ResourceHolderSupport {
@ -223,7 +224,7 @@ public class JmsResourceHolder extends ResourceHolderSupport {
@@ -223,7 +224,7 @@ public class JmsResourceHolder extends ResourceHolderSupport {
@ -83,7 +83,7 @@ public abstract class AbstractJmsListeningContainer extends JmsDestinationAccess
@@ -83,7 +83,7 @@ public abstract class AbstractJmsListeningContainer extends JmsDestinationAccess
@ -42,7 +42,7 @@ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgu
@@ -42,7 +42,7 @@ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgu
@ -113,9 +113,8 @@ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgu
@@ -113,9 +113,8 @@ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgu
@ -166,7 +166,7 @@ public class NativeMessageHeaderAccessor extends MessageHeaderAccessor {
@@ -166,7 +166,7 @@ public class NativeMessageHeaderAccessor extends MessageHeaderAccessor {
@ -187,7 +187,7 @@ public class NativeMessageHeaderAccessor extends MessageHeaderAccessor {
@@ -187,7 +187,7 @@ public class NativeMessageHeaderAccessor extends MessageHeaderAccessor {
@ -61,16 +61,16 @@ public class MutablePersistenceUnitInfo implements SmartPersistenceUnitInfo {
@@ -61,16 +61,16 @@ public class MutablePersistenceUnitInfo implements SmartPersistenceUnitInfo {
@ -81,7 +81,7 @@ public abstract class AbstractRequestExpectationManager implements RequestExpect
@@ -81,7 +81,7 @@ public abstract class AbstractRequestExpectationManager implements RequestExpect
@ -36,7 +36,7 @@ public class DefaultRequestExpectation implements RequestExpectation {
@@ -36,7 +36,7 @@ public class DefaultRequestExpectation implements RequestExpectation {
@ -116,7 +115,7 @@ public class RuleBasedTransactionAttribute extends DefaultTransactionAttribute i
@@ -116,7 +115,7 @@ public class RuleBasedTransactionAttribute extends DefaultTransactionAttribute i
@ -479,7 +479,7 @@ final class PartGenerator extends BaseSubscriber<MultipartParser.Token> {
@@ -479,7 +479,7 @@ final class PartGenerator extends BaseSubscriber<MultipartParser.Token> {
@ -117,7 +117,7 @@ public class HttpRequestMethodNotSupportedException extends ServletException {
@@ -117,7 +117,7 @@ public class HttpRequestMethodNotSupportedException extends ServletException {
@ -142,9 +143,10 @@ public class SpringServletContainerInitializer implements ServletContainerInitia
@@ -142,9 +143,10 @@ public class SpringServletContainerInitializer implements ServletContainerInitia
@ -53,7 +55,7 @@ public class CompositeUriComponentsContributor implements UriComponentsContribut
@@ -53,7 +55,7 @@ public class CompositeUriComponentsContributor implements UriComponentsContribut
@ -85,9 +87,7 @@ public class CompositeUriComponentsContributor implements UriComponentsContribut
@@ -85,9 +87,7 @@ public class CompositeUriComponentsContributor implements UriComponentsContribut
@ -86,7 +86,7 @@ public class InvocableHandlerMethod extends HandlerMethod {
@@ -86,7 +86,7 @@ public class InvocableHandlerMethod extends HandlerMethod {
@ -62,7 +61,7 @@ public class SyncInvocableHandlerMethod extends HandlerMethod {
@@ -62,7 +61,7 @@ public class SyncInvocableHandlerMethod extends HandlerMethod {
@ -897,7 +896,7 @@ public class DispatcherServlet extends FrameworkServlet {
@@ -897,7 +896,7 @@ public class DispatcherServlet extends FrameworkServlet {
@ -230,10 +230,9 @@ public class ResourceBundleViewResolver extends AbstractCachingViewResolver
@@ -230,10 +230,9 @@ public class ResourceBundleViewResolver extends AbstractCachingViewResolver
}
// Build list of ResourceBundle references for Locale.
@ -311,7 +311,7 @@ public class TilesConfigurer implements ServletContextAware, InitializingBean, D
@@ -311,7 +311,7 @@ public class TilesConfigurer implements ServletContextAware, InitializingBean, D