Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,586 Commits 18 Branches 0 Tags
482dd2cf37dc0bb8ce40f1d7e9e8a2f17b681cd0
Commit Graph

11586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juergen Hoeller
482dd2cf37 Fixed typo: "occured"->"occurred" 
(cherry picked from commit be0b71c)
 2016-07-15 17:07:37 +02:00
Juergen Hoeller
f51c90c1cc DigestUtils processes InputStream with buffered read instead of full copy 
Issue: SPR-14427
(cherry picked from commit a1b58ee)
 2016-07-15 17:07:25 +02:00
Juergen Hoeller
b02744d42e Polishing 
(cherry picked from commit e304290)
 2016-07-15 17:07:12 +02:00
Juergen Hoeller
0445ce6c53 Polishing (backported from master) 
(cherry picked from commit 92d78c1)
 2016-07-06 17:35:30 +02:00
Juergen Hoeller
2e075baede Avoid canonicalName call for already-seen bean name 
Issue: SPR-14433
(cherry picked from commit 52065a7)
 2016-07-06 17:35:20 +02:00
Stephane Nicoll
7dbb1ca466 Upgrade copyright 2016-07-04 12:46:04 +02:00
Spring Buildmaster
4b5eedfeb4 Next Development Version 2016-07-04 10:26:51 +00:00
Juergen Hoeller
a637213246 Aligned default Map capacity 2016-07-02 15:15:09 +02:00
Juergen Hoeller
6500018730 HtmlUnitRequestBuilder decodes request parameter names (backport) 
Issue: SPR-14177
 2016-07-02 14:08:24 +02:00
Juergen Hoeller
fa624cd095 Avoid wrapping in plain RuntimeException in favor of IllegalStateException 
(cherry picked from commit e5122d0)
 2016-07-02 14:07:18 +02:00
Juergen Hoeller
cd37873971 Avoid stateful MethodParameter nesting level changes in MVC processing 
(cherry picked from commit e7a53e3)
 2016-07-02 14:07:11 +02:00
Juergen Hoeller
4ddd9572f7 Leniently accept custom DeferredResult etc subclasses for null values 
Issue: SPR-14423
(cherry picked from commit cfc560c)
 2016-07-02 14:07:04 +02:00
Juergen Hoeller
3d106eb655 Upgrade to WebJars Locator 0.32 2016-07-01 15:51:40 +02:00
Juergen Hoeller
3dad61fbbf Backported applicable beans chapter revisions 2016-07-01 15:40:45 +02:00
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