Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,341 Commits 18 Branches 0 Tags
fccec210b4fecbbc3ab758d127a95fb741b21175
Commit Graph

8341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juergen Hoeller
fccec210b4 GenericTypeResolver returns null for entirely unresolvable type arguments only 
Issue: SPR-11763
(cherry picked from commit bea34ea)
 2014-05-08 16:28:53 +02:00
Sebastien Deleuze
96da77ef75 Avoid ConcurrentModificationException 
Removal of cached destination is now moved outside the for loop
that removes subscriptions to avoid ConcurrentModificationException.

Also since updateCache is a LinkedHashMap with accessOrder=true,
a simple access with updateCache.get() modify the map.
By iterating over updateCache.entrySet(), we avoid this update.

Issue: SPR-11755
 2014-05-06 20:22:05 -04:00
Juergen Hoeller
c9417d0610 Fixed invalid code tag in javadoc 
(cherry picked from commit a139670)
 2014-05-01 10:55:55 +02:00
Spring Buildmaster
085e52fc31 Next development version 2014-04-30 15:41:11 -07:00
Juergen Hoeller
8f175046c8 spring-orm-hibernate4 requires aopalliance dependency now (after propdeps upgrade) 2014-04-30 23:19:07 +02:00
Juergen Hoeller
c1dbd9f150 Upgraded to propdeps plugin 0.0.6 
(cherry picked from commit a842b93)
 2014-04-30 22:58:56 +02:00
Juergen Hoeller
42a35ef3be AnnotationMetadataReadingVisitor passes metaAnnotationMap into getMergedAnnotationAttributes algorithm, for finding out about applicable overrides 
Issue: SPR-11649
(cherry picked from commit 842a8a8)
 2014-04-30 22:57:09 +02:00
Rossen Stoyanchev
21fd68150a Log ignored CONNECT messages at error level 
Issue: SPR-11673
 2014-04-30 11:12:32 -04:00
Rossen Stoyanchev
d20259be1d Log STOMP ERROR frames at error level 
Issue: SPR-11673
 2014-04-30 11:01:18 -04:00
Rossen Stoyanchev
6ca921021c Update log level 
Issue: SPR-11673
 2014-04-30 10:28:27 -04:00
Rossen Stoyanchev
eab9d24c31 Fix Javadoc typo 2014-04-30 10:07:51 -04:00
Juergen Hoeller
15749c2a9d Upgraded to Gradle 1.12 and updated several dependencies to latest maintenance releases 
(cherry picked from commit e84f61b)
 2014-04-30 14:32:12 +02:00
Juergen Hoeller
93b0f0b126 JRubyScriptUtils defensively handles null Nodes in findClassNode (fails against JRuby 1.7.12 otherwise) 
Issue: SPR-11747
(cherry picked from commit adb616b)
 2014-04-30 14:32:07 +02:00
Juergen Hoeller
27b2ed1614 Spring Framework build uses Reactor 1.1 GA now, getting rid of last remaining pre-GA dependency 2014-04-30 11:41:57 +02:00
Rossen Stoyanchev
790d62bcb1 Simplify and improve STOMP broker relay int tests 2014-04-29 23:01:40 -04:00
Rossen Stoyanchev
563476f57c Split destination cache into access vs update 
Issue: SPR-11657
 2014-04-29 22:16:49 -04:00
Rossen Stoyanchev
79de45b805 Add cache limit to DefaultSessionRegistry and polish 
Issue: SPR-11657
 2014-04-29 18:17:40 -04:00
Sebastien Deleuze
63a868dafb Fix DefaultSubscriptionRegistry when using pattern destinations 
DestinationCache is now used for both plain and pattern
destinations. It stores internally the subscriptions map for each
cached destination. Subscriptions are initially created when there
is no cache for the requested destination, and are updated when
subscriptions change.

Issue: SPR-11657
 2014-04-29 18:17:30 -04:00
Juergen Hoeller
1afdd9bd75 Polishing 
(cherry picked from commit 02aca9c)
 2014-04-30 00:10:58 +02:00
Juergen Hoeller
d0c839f0eb Polishing 2014-04-29 16:21:06 +02:00
Juergen Hoeller
744727b8aa AbstractAdvisingBeanPostProcessor uses target class check for existing proxy but checks against actual exposed object otherwise (catching introductions) 
Issue: SPR-11725
(cherry picked from commit a0658c5)
 2014-04-29 16:01:44 +02:00
Rossen Stoyanchev
9fbb7394e2 Polish STOMP documentation 2014-04-28 22:35:51 -04:00
Sebastien Deleuze
80cb0c4e5b Include more guidance about DispatcherServlet context 
Also update <mvc:annotation-driven /> comment in XSD.

Issue: SPR-11703
 2014-04-28 22:10:52 -04:00
Rossen Stoyanchev
5c4804f4a4 Document STOMP-related ApplicationContext events 
Issue: SPR-11672
 2014-04-28 21:59:09 -04:00
Juergen Hoeller
a679f3e7a3 Polishing 
(cherry picked from commit be5f2a8)
 2014-04-28 23:52:23 +02:00
Juergen Hoeller
bd5b3749c5 Revised @PropertySource parsing for consistent PropertySource naming, avoiding accidental overriding by name 
Issue: SPR-11637
(cherry picked from commit ab24dda)
 2014-04-28 23:47:33 +02:00
Juergen Hoeller
89398b0811 AspectJExpressionPointcut defensively handles fallback expression parsing 
Issue: SPR-9335
(cherry picked from commit ce4912b)
 2014-04-28 23:47:25 +02:00
Juergen Hoeller
a87c9b8c5c Test for base package specified as config location 
Issue: SPR-11647
(cherry picked from commit 8e6e6c2)
 2014-04-28 23:47:14 +02:00
Juergen Hoeller
d0f9853769 Test for overriding singleton @Bean method with scoped proxy in configuration subclass 
Issue: SPR-10744
(cherry picked from commit 299776f)
 2014-04-28 23:46:51 +02:00
Juergen Hoeller
bed739ce92 GenericBeanDefinition's toString() takes parent definition into account 
Issue: SPR-9671
(cherry picked from commit 0ef29b2)
 2014-04-28 23:46:40 +02:00
Rossen Stoyanchev
cb712afa97 Improve handling of disconnects in STOMP broker relay 
This is a backport of:
990f5bb720

Issue: SPR-11655
 2014-04-28 10:08:00 -04:00
Juergen Hoeller
c97c246940 Polishing 2014-04-28 00:29:04 +02:00
Juergen Hoeller
4196e6c96f AbstractMarshaller avoids SAXSource workaround when processExternalEntities=true 
Issue: SPR-11737
(cherry picked from commit 93d13cf)
 2014-04-28 00:27:04 +02:00
Juergen Hoeller
59cef3ce81 General defensiveness about the bootstrap ClassLoader (i.e. null ClassLoader) 
Issue: SPR-11721
 2014-04-28 00:26:18 +02:00
Juergen Hoeller
c8ea80d7ed Configuration class processing explicitly skips java.* classes since we'll never find @Bean annotations there anyway 
Issue: SPR-11718
(cherry picked from commit 470e9c8)
 2014-04-28 00:17:19 +02:00
Juergen Hoeller
656fc52ff9 @Bean processing explicitly ignores bridge methods (for method overrides with return type narrowing on JDK 8) 
Issue: SPR-11718
(cherry picked from commit dc93406)
 2014-04-28 00:16:38 +02:00
Rossen Stoyanchev
a4d6f8473e Upgrade to reactor 1.1 RC1 2014-04-25 12:32:36 -04:00
Rossen Stoyanchev
443fb8e4ee Fix issue with subscribe destination 
The original fix for SPR-11423:
32e5f57e64

was insufficient when using an external broker since the original
destination header has to be in the "native headers" map (i.e. with
STOMP headers) in order to be included in messages broadcast by
the broker.
 2014-04-25 12:17:08 -04:00
Juergen Hoeller
95b1cb7173 AspectJ 1.8 final used in build, plus TestNG preparations for optional -target 1.8 usage 
Issue: SPR-11212
Issue: SPR-11699
 2014-04-24 11:09:39 +02:00
Juergen Hoeller
51fb485181 Polishing 
(cherry picked from commit 9353332)
 2014-04-24 10:32:38 +02:00
Juergen Hoeller
f16e6c4105 General defensiveness about the bootstrap ClassLoader (i.e. null ClassLoader) 
Issue: SPR-11721
(cherry picked from commit c05ab3e)
 2014-04-24 10:31:48 +02:00
Juergen Hoeller
4dbc0c296c Polishing 
(cherry picked from commit ec7d80b)
 2014-04-24 10:31:39 +02:00
Juergen Hoeller
d71d38bfaf ServletServerHttpResponse specifically checks for Servlet 3.0's HttpServletResponse.getHeader(String) method 
Issue: SPR-11712
(cherry picked from commit 21f9ca0)
 2014-04-24 10:31:29 +02:00
Juergen Hoeller
eb28259371 SpringProperties falls back to ClassLoader.getSystemResource when loaded in bootstrap ClassLoader 
Issue: SPR-11721
(cherry picked from commit 9cb5f48)
 2014-04-24 10:31:20 +02:00
Juergen Hoeller
7ae6a60f43 checkNotModified leniently handles IE-10-style If-Modified-Since values and silently proceeds if header value cannot be parsed at all 
Issue: SPR-11727
(cherry picked from commit 794e859)
 2014-04-24 10:30:49 +02:00
Juergen Hoeller
d3c9a31e9a DispatcherServlet skips multipart resolution if error page exception attribute indicates MultipartException as root cause 
Issue: SPR-11716
(cherry picked from commit 5b47816)
 2014-04-24 10:30:12 +02:00
Juergen Hoeller
5aa126600f Final patches from ASM 5.0.2 release 
Issue: SPR-11212
(cherry picked from commit fb66567)
 2014-04-24 10:29:50 +02:00
Juergen Hoeller
2f15f72fcc ShallowEtagHeaderFilter writes body early on sendError/sendRedirect and interprets setContentLength/setBufferSize as a hint for capacity increase 
Issue: SPR-11705
Issue: SPR-11717
(cherry picked from commit 3f392e3)
 2014-04-24 10:28:42 +02:00
Juergen Hoeller
d5aacdefd9 Polishing 
(cherry picked from commit 700c3b2)
 2014-04-24 10:27:43 +02:00
Juergen Hoeller
e379e77b96 considerInterfaces should work without considerInherited as well 
Issue: SPR-11719
(cherry picked from commit 5ab7076)
 2014-04-24 10:27:15 +02:00