root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Remove unnecessary loop in SerializableTypeWrapper 

Since arbitrary levels of proxies do not occur, this commit replaces
the `while` loop in SerializableTypeWrapper.unwrap() with a simple
`if` statement.

Closes gh-23415
This commit is contained in:
Sam Brannen 2019-08-07 12:24:48 +02:00
parent 83956f8e8b
commit a43ba052e9
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-core/src/main/java/org/springframework/core/SerializableTypeWrapper.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -51,6 +51,7 @@ import org.springframework.util.ReflectionUtils;
* *
* @author Phillip Webb * @author Phillip Webb
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Sam Brannen
* @since 4.0 * @since 4.0
*/ */
final class SerializableTypeWrapper { final class SerializableTypeWrapper {
@ -89,8 +90,8 @@ final class SerializableTypeWrapper {
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static <T extends Type> T unwrap(T type) { public static <T extends Type> T unwrap(T type) {
Type unwrapped = type; Type unwrapped = null;
while (unwrapped instanceof SerializableTypeProxy) { if (type instanceof SerializableTypeProxy) {
unwrapped = ((SerializableTypeProxy) type).getTypeProvider().getType(); unwrapped = ((SerializableTypeProxy) type).getTypeProvider().getType();
} }
return (unwrapped != null ? (T) unwrapped : type); return (unwrapped != null ? (T) unwrapped : type);

2
spring-core/src/test/java/org/springframework/core/SerializableTypeWrapperTests.java
View File

@ -33,8 +33,6 @@ import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Tests for {@link SerializableTypeWrapper}. * Tests for {@link SerializableTypeWrapper}.
* *