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

8374 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juergen Hoeller
d4e1b9eb4c Polishing 
(cherry picked from commit 6fef8b9)
 2014-05-20 11:11:33 +02:00
Rossen Stoyanchev
44ee51a6c9 Disable URL resolution in DTD declarations 
Issue: SPR-11768
 2014-05-19 22:23:51 -04:00
Juergen Hoeller
ba6d187b5c Consistent MvcUriComponentsBuilder assertion handling 
(cherry picked from commit 61b47ba)
 2014-05-20 01:51:33 +02:00
Juergen Hoeller
54636b3f7c Further UriComponentsBuilder javadoc revision 2014-05-20 01:13:18 +02:00
Juergen Hoeller
545c28fd4e Minor UriComponentsBuilder javadoc revision 2014-05-20 00:47:03 +02:00
Juergen Hoeller
95a7bfd327 Consistent use of IllegalStateException instead of InternalError for UnsupportedEncodingException cause 
(cherry picked from commit d9b39ad)
 2014-05-20 00:42:48 +02:00
Juergen Hoeller
ccebbf74ec Latest patches from ASM trunk 
(cherry picked from commit cfc720d)
 2014-05-19 22:59:39 +02:00
Juergen Hoeller
c350080f99 StringUtils.parseLocaleString parses variant correctly when variant contains country code 
This commit also includes a JUnit 4 style revision of StringUtilsTests and ObjectUtilsTests.

Issue: SPR-11806
(cherry picked from commit 295a6ae)
 2014-05-19 22:46:47 +02:00
Juergen Hoeller
6b9738fd68 Building against latest javax.el 2.2.x version 
(cherry picked from commit f73a8ba)
 2014-05-19 20:46:42 +02:00
Juergen Hoeller
1120680c65 Consistently log Class.getName() instead of Class.toString(), avoiding double class term in log message 
Issue: SPR-11804
(cherry picked from commit 2619955)
 2014-05-19 20:46:14 +02:00
Juergen Hoeller
a2ef2c9d3e Refined check for NoClassDefFoundError in getTestExecutionListeners() 
Issue: SPR-11804
(cherry picked from commit 41ed228)
 2014-05-19 17:28:37 +02:00
Juergen Hoeller
1bbc032071 Backported proper updateAccessedAttributes test 
Issue: SPR-11738
(cherry picked from commit 6188550)
 2014-05-19 16:42:42 +02:00
Juergen Hoeller
c70a81a805 Javadoc fixes 2014-05-19 00:08:46 +02:00
Juergen Hoeller
3c709a763d Servlet 3 multipart request implements getParameterNames defensively (for WebLogic 12 compatibility) 
This commit also includes lazy resolution support for StandardServletMultipartResolver, along the lines of existing lazy mode in CommonsMultipartResolver.

Issue: SPR-11074
Issue: SPR-11730
(cherry picked from commit 82336c3)
 2014-05-18 20:27:44 +02:00
Juergen Hoeller
7d78c65187 Properly evaluate @Conditional in case of multiple imports for same config class (fixing regression in Spring Boot) 
Issue: SPR-11788
 2014-05-18 02:00:11 +02:00
Rossen Stoyanchev
748167bfa3 Improve StringUtils.cleanPath 
Issue: SPR-11793
 2014-05-16 11:27:55 -04:00
Juergen Hoeller
3e70013b55 JmsResourceHolder checks for nested DataSource transactions as well (for Oracle AQ compatibility) 
Issue: SPR-11791
(cherry picked from commit 5faacd5)
 2014-05-16 15:36:16 +02:00
Juergen Hoeller
ea9ad4ee9b Properly evaluate @Conditional in case of multiple imports for same config class 
Issue: SPR-11788
(cherry picked from commit 52f44b3)
 2014-05-16 15:35:56 +02:00
Rossen Stoyanchev
482eff81e1 Await TcpClient shutdown in STOMP relay 2014-05-15 21:46:44 -04:00
Juergen Hoeller
c706cbbed4 Latest possible dependency updates for spring-orm 
(cherry picked from commit 0d22719)
 2014-05-15 17:35:32 +02:00
Juergen Hoeller
7bc38acbf6 Polishing 2014-05-15 15:23:11 +02:00
Juergen Hoeller
297e4eec36 Keep unused MemorySafeUndeclaredThrowableStrategy around in deprecated form for the 4.0.x line 
Issue: SPR-11782
 2014-05-15 15:05:00 +02:00
Juergen Hoeller
235b65d103 Polishing 
(cherry picked from commit b0f0d2f)
 2014-05-15 14:43:02 +02:00
Juergen Hoeller
8a28645dd6 ResultSetWrappingSqlRowSet preserves first matching column per name (as defined in ResultSet's javadoc) 
Issue: SPR-11786
(cherry picked from commit 0728e32)
 2014-05-15 14:40:43 +02:00
Juergen Hoeller
f94ded830d Consistent use of ClassUtils.forName instead of class.getClassLoader().loadClass 
Issue: SPR-11780
(cherry picked from commit 551950c)
 2014-05-15 14:40:15 +02:00
Juergen Hoeller
ad8f17b6af Test compatibility with JasperReports 5.5.2 2014-05-12 23:35:17 +02:00
Juergen Hoeller
261520cea0 Undertow-related polishing 
(cherry picked from commit 2750ab6)
 2014-05-12 23:32:12 +02:00
Juergen Hoeller
00aa40b8da Consistent EhCache version between 4.1 and 4.0.5 2014-05-12 23:27:16 +02:00
Juergen Hoeller
ac9b64e528 Consistent declaration of JSP, JSTL and JavaMail API dependencies; updated several dependencies to latest maintenance releases (Tiles 3.0.4, Jetty 9.1.5) 2014-05-12 21:50:13 +02:00
Juergen Hoeller
1e7fade89e JasperReports-related polishing 
(cherry picked from commit 782d10c)
 2014-05-12 20:50:24 +02:00
Stephane Nicoll
3c58be05a5 Fix typo 
Issue: SPR-11571
(cherry picked from commit 6551aa6)
 2014-05-08 16:38:08 +02:00
Juergen Hoeller
ef290ff95c Additional tests for configuration class importing via ASM 
Issue: SPR-11647
(cherry picked from commit 8c9116f)
 2014-05-08 16:31:07 +02:00
Juergen Hoeller
ae45794451 IdToEntityConverter defensively handles access to getDeclaredMethods 
Issue: SPR-11758
(cherry picked from commit 381ccde)
 2014-05-08 16:30:45 +02:00
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