Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,935 Commits 18 Branches 0 Tags
9e2060707ac8aefc6de3d8156fd3f8fd7f62e2fc
Commit Graph

6935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juergen Hoeller
9e2060707a General defensiveness about the bootstrap ClassLoader (i.e. null ClassLoader) 
Issue: SPR-11721
 2014-04-27 22:29:08 +02:00
Juergen Hoeller
2c1203dc9f AnnotationTypeFilter prevents ASM-based loading of java.* and javax.* interfaces as well 
Issue: SPR-11719
 2014-04-27 22:28:56 +02:00
Juergen Hoeller
6ee0596c3a SpringProperties falls back to ClassLoader.getSystemResource when loaded in bootstrap ClassLoader 
Issue: SPR-11721
(cherry picked from commit 9cb5f48)
 2014-04-27 22:28:08 +02:00
Juergen Hoeller
93d13cfcb1 AbstractMarshaller avoids SAXSource workaround when processExternalEntities=true 
Issue: SPR-11737
 2014-04-27 22:27:46 +02:00
Juergen Hoeller
de80cd9b3b ASM 5.0.2 for correct Java 7 stack map frame computations 
Issue: SPR-11656
 2014-04-25 23:50:02 +02:00
Juergen Hoeller
470e9c8558 Configuration class processing explicitly skips java.* classes since we'll never find @Bean annotations there anyway 
Issue: SPR-11718
 2014-04-25 23:39:50 +02:00
Juergen Hoeller
dc934064a2 @Bean processing explicitly ignores bridge methods (for method overrides with return type narrowing on JDK 8) 
Issue: SPR-11718
 2014-04-25 23:37:37 +02:00
Juergen Hoeller
5d5f70473a 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-25 23:33:10 +02:00
HejiaHo
ac85eab372 Fix ConcurrentReferenceHashMap max constraints 
Update calculateShift to respect the maximum upper bound as well as the
minimum value.

Issue: SPR-11720

(cherry picked from commit 16410cad)
 2014-04-22 15:01:51 +01:00
Juergen Hoeller
ffaac0ecf3 Polishing 2014-04-18 13:23:05 +02:00
Juergen Hoeller
5aa93674a3 Consistent documentation for both 'close' and 'shutdown' as inferred destroy methods 
Issue: SPR-11680
(cherry picked from commit 14f9dbf)
 2014-04-18 12:09:27 +02:00
Phillip Webb
62941b7937 Fixup .mailmap file 
Fix a few issues with the `.mailmap` file.

(cherry picked from commit 3a5de00c)
 2014-04-18 11:01:38 +01:00
Graham Lea
5fac6614b6 Added a Git .mailmap file 
(cherry picked from commit a5e1932c)
 2014-04-18 09:50:43 +01:00
Sam Brannen
a169c0e727 Ensure Gradle does not execute inner classes as tests 2014-04-10 16:56:56 +02:00
Juergen Hoeller
94caaedf84 Polishing 2014-04-09 20:31:15 +02:00
Juergen Hoeller
be6b54fe8b JBoss "vfszip" resources need to be treated as jar URLs 
Issue: SPR-11676
 2014-04-09 20:30:50 +02:00
Juergen Hoeller
9ac46a965f Java 8 bytecode compatibility for Spring 3.2.x 
Issue: SPR-11656
 2014-04-09 20:29:17 +02:00
Juergen Hoeller
d8a0f7578d Commons Logging resolution failure with JasperReports 2.0.5 -> easiest way out: upgrade to JasperReports 3.7.6 (which in turn requires POI 3.6) 2014-04-02 22:59:42 +02:00
Juergen Hoeller
99a3e9cacb Revised ByteArrayOutputStream handling in MarshallingView and co 
Issue: SPR-11646
(cherry picked from commit 8006696)
 2014-04-02 22:56:34 +02:00
Juergen Hoeller
f93bfa8f84 ResourceHttpRequestHandler explicitly closes a Resource's InputStream 
Issue: SPR-11644
(cherry picked from commit 3a96f16)
 2014-04-02 22:55:52 +02:00
Juergen Hoeller
b80dc9d642 Polishing 
Issue: SPR-11262
(cherry picked from commit d628025)
 2014-04-02 22:55:33 +02:00
Sam Brannen
b31750fafb Reinject Servlet mocks between TestNG test methods 
Prior to this commit, if multiple test methods were executed in a
subclass of AbstractTestNGSpringContextTests annotated with
@WebAppConfiguration, then injected Servlet API mocks would only
reference the mocks created for the first test method. Subsequent test
methods could therefore never reference the current mocks, and there
was a discrepancy between the state of the injected mocks and the mock
set in the RequestContextHolder.

This commit addresses this issue by ensuring that dependencies
(including updated mocks) are injected into the test instance before
the next test method if the ServletTestExecutionListener resets the
request attributes in RequestContextHolder.

Issue: SPR-11626
(cherry picked from commit c38600762d)
 2014-03-29 21:43:42 +01:00
Juergen Hoeller
a4a2e80f23 Consider a null ClassLoader (typically the bootstrap CL) as cache-safe 
Issue: SPR-11606
 2014-03-26 23:48:29 +01:00
Juergen Hoeller
e8c06c6d99 Consistent PropertyAccessor method order as declared in the interface 
Issue: SPR-11609
(cherry picked from commit b70148c)
 2014-03-26 21:57:40 +01:00
Juergen Hoeller
d8180e1e20 Correctly resolve accessors for static properties on Class 
Issue: SPR-11609
(cherry picked from commit 3af8a32)
 2014-03-26 21:57:35 +01:00
Juergen Hoeller
88485dc1a7 Maintenance version updates (aligned with 4.0.3 release) 2014-03-26 21:12:25 +01:00
Juergen Hoeller
a25d67770e Added expression test case for constant on Map 
Issue: SPR-11609
 2014-03-26 21:11:49 +01:00
Juergen Hoeller
5c9fc09852 Added Spring Data oriented conversion test case 
Issue: SPR-11608
 2014-03-26 20:50:00 +01:00
Juergen Hoeller
e1602f7f83 AbstractApplicationEventMulticaster only caches if event type and source type are cache-safe 
Issue: SPR-11606
(cherry picked from commit 3388573)
 2014-03-26 20:34:55 +01:00
Juergen Hoeller
20228e78c5 CacheAspectSupport checks Cache.get(key) once per invocation only 
Issue: SPR-11592
 2014-03-26 00:21:39 +01:00
Juergen Hoeller
623b1fc0d5 Polishing 2014-03-25 00:37:01 +01:00
Juergen Hoeller
a2bdc284f9 DispatcherServlet logs request URI in encoded form only 
Issue: SPR-11591
(cherry picked from commit 465ca24)
 2014-03-25 00:36:36 +01:00
Juergen Hoeller
dbd5f67498 Consistently applied appropriate ByteArrayOutputStream initial capacities across the codebase 
Issue: SPR-11594
(cherry picked from commit dd7f54c)
 2014-03-25 00:35:33 +01:00
Juergen Hoeller
ab85aa2096 BufferedImageHttpMessageConverter ignores empty MIME types 
Issue: SPR-11581
(cherry picked from commit 90e3dbb)
 2014-03-25 00:34:53 +01:00
Juergen Hoeller
5c3f6a1571 Revised naming for prototype inner beans to avoid excessive unique name calculation 
Restored original singleton-only adaptInnerBeanName behavior, avoiding endless unique name calculation for every single prototype instance. Non-named inner BeanDefinition objects now suffixed with an identity hex code analogous to non-named XML bean definitions, largely avoiding naming collisions to begin with. After SPR-11246, post-processors can deal with unstable classes per bean name, so occasional collisions aren't a hard problem anymore.

Issue: SPR-11545
(cherry picked from commit 5308b3e)
 2014-03-25 00:34:41 +01:00
Juergen Hoeller
b73a43972e Upgraded to TestNG 6.8.8 and Hibernate 4.2.10 2014-03-11 21:36:44 +01:00
Juergen Hoeller
9585752693 Polishing 2014-03-11 21:36:10 +01:00
Juergen Hoeller
5c0fdb05bd AbstractFlashMapManager needs to decode parameter names 
Also includes general alignment with the 4.0.3 versions of AbstractFlashMapManager and FlashMapManagerTests.

Issue: SPR-11504
 2014-03-11 21:35:36 +01:00
Juergen Hoeller
eeb82c409a SpEL property-not-found message hints at non-public method/field 
Issue: SPR-11535
 2014-03-11 10:47:53 +01:00
Juergen Hoeller
d317b637e0 CollectionToCollectionConverter avoids collection copy for untyped collection when simply returning source anyway 
Also uses addAll instead of iteration over untyped collection now, supporting optimized addAll in target collection type, and avoids repeated getElementTypeDescriptor calls.

Issue: SPR-11479
(cherry picked from commit bea94d5)
 2014-03-10 18:48:01 +01:00
Stephane Nicoll
b1bcc5d6eb Fix double SPeL evaluation of parameter 
When a node of an SPeL expression was a call to a bean referenced
 in a method argument, the expression was resolved twice.

 The resolved arguments are now specified to MethodValueRef instead
 of resolving the arguments again in the constructor

 Issue: SPR-11445
(cherry picked from commit 519799e)
 2014-03-07 14:59:41 +01:00
Juergen Hoeller
f1ba789494 DefaultListableBeanFactory only puts 'cache-safe' Class keys into its by-type cache 
Issue: SPR-11520
(cherry picked from commit 93c8b7a)
 2014-03-07 14:58:51 +01:00
Juergen Hoeller
d642cd21bb SpringBeanELResolver's setValue should not throw PropertyNotWritableException if provided value is identical to current bean instance 
Issue: SPR-11502
(cherry picked from commit 7972b31)
 2014-03-07 14:58:16 +01:00
Juergen Hoeller
70155e9ff9 KeyGenerators should not return a plain array parameter as raw key but rather always handle that case in a deepHashCode fashion 
Issue: SPR-11505
(cherry picked from commit e50cff4)
 2014-03-07 14:57:25 +01:00
Juergen Hoeller
7e2a214f32 instantiateUsingFactoryMethod avoids NPE and reports argument types in case of explicitArgs and resolved generic arguments as well 
Issue: SPR-11517
(cherry picked from commit ad31777)
 2014-03-07 14:56:45 +01:00
Juergen Hoeller
4c9c7634d0 Log4jWebConfigurer does not try to parse empty "log4jRefreshInterval" context-param 
Issue: SPR-11507
(cherry picked from commit 9b77157)
 2014-03-07 14:55:44 +01:00
Juergen Hoeller
69c54a053c Fixed content length check in XmlValidationModeDetector 
Issue: SPR-11477
(cherry picked from commit 1763bfb)
 2014-03-07 14:55:11 +01:00
Rossen Stoyanchev
4b9aad8f65 Refactor async result handling in Spring MVC Test 
This change removes the use of a CountDownLatch to wait for the
asynchronously computed controller method return value. Instead we
check in a loop every 200 milliseconds if the result has been set.
If the result is not set within the specified amount of time to wait
an IllegalStateException is raised.

Additional changes:
 - Use AtomicReference to hold the async result
 - Remove @Ignore annotations on AsyncTests methods
 - Remove checks for the presence of Servlet 3

Issue: SPR-11516
 2014-03-05 14:54:34 -05:00
Spring Buildmaster
5fe436c9a9 Next development version 2014-02-18 21:51:58 -08:00
Phillip Webb
082a564b9b Update changelog for 3.2.8 2014-02-18 20:58:34 -08:00