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
11,572 Commits 18 Branches 337 Tags 372 MiB
Commit Graph

11572 Commits

Author SHA1 Message Date
Stephane Nicoll d73f91eaf0 Polish 
Closes gh-1097
(cherry picked from commit 037746d)
 2016-07-01 15:40:06 +02:00
Juergen Hoeller db4882cea4 Polishing 2016-06-30 21:45:55 +02:00
Juergen Hoeller 833ed7168e Add missing package-info files for common packages 
Issue: SPR-14420
(cherry picked from commit 66ec1c1)
 2016-06-30 21:43:29 +02:00
Juergen Hoeller 09c7194c78 Polishing 
(cherry picked from commit 232cfe5)
 2016-06-30 14:16:20 +02:00
Juergen Hoeller a63247b281 Polishing 2016-06-29 16:07:03 +02:00
Juergen Hoeller dd7ddc08ff Polishing 2016-06-29 14:48:09 +02:00
Stephane Nicoll 3564616b7f Align caching AspectJ configuration 
The `CacheResolver` and `ErrorHandler` features introduced in 4.1 were
not properly enabled in AspectJ mode. This commit adds more tests from
the regular proxy-based mode and align the AspectJ caching configuration.

Issue: SPR-14413
(cherry picked from commit 6cd85dd)
 2016-06-29 14:47:39 +02:00
Juergen Hoeller 07c9c55fd3 PayloadArgumentResolver's MessageConversionException includes original payload type 
Issue: SPR-14394
(cherry picked from commit f5282bc)
 2016-06-29 14:47:20 +02:00
Juergen Hoeller 0d3a22c487 Avoid potential deadlock in AbstractBeanFactoryPointcutAdvisor 
Issue: SPR-14388
(cherry picked from commit fd9d518)
 2016-06-29 14:46:41 +02:00
Juergen Hoeller f19599884d Fixed ambiguous sentence in conditional cache documentation 
Issue: SPR-14399
(cherry picked from commit 4102c62)
 2016-06-29 14:46:23 +02:00
Juergen Hoeller f60c6c90c1 Upgrade to CGLIB 3.2.4 
Issue: SPR-14385
 2016-06-29 14:46:15 +02:00
Rossen Stoyanchev 269742589b Improve static resource path check 2016-06-28 16:50:32 -04:00
Rossen Stoyanchev 4c87167c98 Add heartbeat lock to SockJS server sessions 
Even before this change SockJS sessions always cancelled the heartbeat
task first prior to sending messages. However when the heartbeat task
is already in progress, cancellation of it is not enough and we must
wait until the heartbeat is sent.

This commit adds a heartbeat write lock which is obtained and held
during the sending of a heartbeat. Now when sessions send a message
they still cancel the heartbeat task but if that fails they also wait
for the heartbeat write lock.

Issue: SPR-14356
 2016-06-17 17:10:49 -04:00
Juergen Hoeller 71df9cef80 ObjectUtils.nullSafeEquals allows for JVM method inlining (through reducing its bytecode size) 
Issue: SPR-14349
(cherry picked from commit ca12e13)
 2016-06-09 22:42:05 +02:00
Juergen Hoeller 3680ec5a0d Polishing 2016-06-09 17:21:23 +02:00
Juergen Hoeller f9e8924b3d Consistent processing of empty values and catching of RuntimeExceptions for Formatters 
Issue: SPR-14345
(cherry picked from commit d51c22a)
 2016-06-09 10:59:13 +02:00
Juergen Hoeller 367e663730 Assertions for error codes in case of formatting failures 
Issue: SPR-14345
(cherry picked from commit c6f63bd)
 2016-06-08 16:26:48 +02:00
Juergen Hoeller 9ac661df82 Polishing 2016-06-08 14:13:22 +02:00
Juergen Hoeller 57aa2afaa0 Upgrade to Jackson 2.6.7 and Netty 4.0.37 2016-06-08 10:06:26 +02:00
Juergen Hoeller c349ac9d42 Upgrade to Groovy 2.4.7 
(cherry picked from commit f5a9d5e)
 2016-06-07 18:10:02 +02:00
Juergen Hoeller 7001707028 CorsFilter asserts presence of CorsConfigurationSource 
(cherry picked from commit 31aed61)
 2016-06-07 16:50:24 +02:00
Juergen Hoeller 9a41774364 Fixed @since references after SPR-14080 backport 
Issue: SPR-14305
 2016-06-07 13:35:19 +02:00
Juergen Hoeller d0b2fe5e8c Allow JAXB to be registered next to plain Jackson 
Issue: SPR-14336
(cherry picked from commit abcfffd)
 2016-06-07 13:30:11 +02:00
Juergen Hoeller e9ba64ae49 Upgrade to EhCache 3.0.2 and Castor 1.4.1 
(cherry picked from commit 3c987b1)
 2016-06-06 22:23:39 +02:00
Juergen Hoeller 47c62fd173 Synchronized access to method overrides (in particular for @Lookup) 
Issue: SPR-14333
(cherry picked from commit 9131ebb)
 2016-06-06 17:45:21 +02:00
Juergen Hoeller 24b3525f8d Upgrade to Undertow 1.3.23 2016-06-04 11:20:21 +02:00
Juergen Hoeller e219576414 Defensive catching of any Throwable subclasses instead of just Error 
Issue: SPR-14329
Issue: SPR-14323
(cherry picked from commit a9fda3e)
 2016-06-04 00:27:24 +02:00
Juergen Hoeller 2fd691b340 EventListenerMethodProcessor defensively handles unresolvable method signatures 
Issue: SPR-14330
(cherry picked from commit f657952)
 2016-06-04 00:22:46 +02:00
Juergen Hoeller d467dc2a05 Avoid double getFlushMode call 2016-06-04 00:20:46 +02:00
Juergen Hoeller 24b9e3a0be Latest applicable dependency updates (Commons FileUpload 1.3.2, Tomcat 8.0.35, HSQLDB 2.3.4, H2 1.4.192) 2016-06-02 17:14:29 +02:00
Juergen Hoeller f36070b560 Polishing 
(cherry picked from commit 521c41d)
 2016-06-02 17:14:07 +02:00
Juergen Hoeller 899131997e Less restrictive CORS origin comparison 
UriComponentsBuilder allows more efficient (and less restrictive) CORS
origin comparison.

Also introduces a specifically narrowed cloneBuilder() method for
UriComponentsBuilders.

Cherry-picked from 9a52c8.

Issue: SPR-14080
 2016-05-31 12:25:16 -04:00
Juergen Hoeller a27200e753 Polishing 2016-05-31 13:27:34 +02:00
Juergen Hoeller 933bbf2de9 AbstractBeanFactory.markBeanAsCreated() reliably clears merged bean definition only once 
Issue: SPR-14269
(cherry picked from commit 9064d38)
 2016-05-31 13:26:33 +02:00
Juergen Hoeller 1d0c305a25 BeanWrapper avoids StringIndexOutOfBoundsException for incompletely quoted keys 
Issue: SPR-14293
(cherry picked from commit cf0a0cd)
 2016-05-31 13:22:44 +02:00
Juergen Hoeller 62199e82ef ConfigurationClassParser detects @Bean methods in interface hierarchies as well 
Issue: SPR-14288
(cherry picked from commit 03affa0)
 2016-05-31 13:22:29 +02:00
Juergen Hoeller 7de2976c1e Consistent meta-annotation attributes lookup through ASM 
Issue: SPR-14257
(cherry picked from commit 24f5f36)
 2016-05-31 13:22:21 +02:00
Juergen Hoeller cc7758869c SettableListenableFuture properly rethrows Error 
Issue: SPR-14298
(cherry picked from commit a979885)
 2016-05-31 13:22:16 +02:00
Juergen Hoeller f64ed69280 ServletServerHttpRequest.getHeaders() ignores invalid content type 
Issue: SPR-14309
(cherry picked from commit f7f2327)
 2016-05-31 13:21:46 +02:00
Juergen Hoeller 07b5763324 SpringTilesContainerFactory uses Tiles 3's createDecoratedContainer 
Issue: SPR-14311
(cherry picked from commit 2d85acc)
 2016-05-31 13:21:38 +02:00
Juergen Hoeller 7b73f23f43 For attribute is not actually required 
Issue: SPR-14287
(cherry picked from commit dacc31e)
 2016-05-31 13:21:06 +02:00
Juergen Hoeller a0a2a3337a @Bean's "autowire" attribute does not affect annotation-driven autowiring 
Issue: SPR-14282
(cherry picked from commit 98eaf05)
 2016-05-31 13:21:00 +02:00
Juergen Hoeller ad29db8675 Reference documentation updates 
Issue: SPR-14087
Issue: SPR-14272
Issue: SPR-13535
Issue: SPR-13843
Issue: SPR-14164
Issue: SPR-14319
 2016-05-31 13:20:33 +02:00
Juergen Hoeller a2088c38ad Latest applicable dependency updates (Joda-Time 2.9.4, Jetty 9.3.9, EhCache 3.0.1) 2016-05-31 13:19:52 +02:00
Rossen Stoyanchev 28321946bf Remove unnecessary assertion 
Issue: SPR-14279
 2016-05-22 06:23:57 -04:00
Rossen Stoyanchev b5022108c7 Fix STOMP connect failure related memory leak 
Normally heartbeats keep connections from hanging. However in some
cases a connection may hang before a CONNECTED frame is received
and heartbeats are put in place. This commit adds a change to enforce
a 60 limit on receiving the CONNECTED frame.

Issue: SPR-14266
 2016-05-13 07:47:11 -04:00
Spring Buildmaster 6eba220d1b Next Development Version 2016-05-06 07:56:13 +00:00
Juergen Hoeller 5fc0d43852 AsyncResult properly propagates execution exception 
Issue: SPR-14249
(cherry picked from commit 1b1aac9)
 2016-05-05 20:57:42 +02:00
Juergen Hoeller 2dbc8b0381 Latest applicable dependency updates (EhCache 2.10.2, JRuby 1.7.25, Quartz 2.2.3, Undertow 1.3.22) 2016-05-04 18:44:11 +02:00
Juergen Hoeller 0f2bc3f6bf AbstractRequestLoggingFilter ignores non-available query string 
Issue: SPR-14244
(cherry picked from commit 08ddd1b)
 2016-05-04 18:44:04 +02:00