Merge branch '5.1.x'

2019-07-30 17:34:29 +02:00
parent 5e15bbfbf1 b2c56590dd
commit 8ef557df2f
16 changed files with 87 additions and 43 deletions
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
@@ -430,7 +430,7 @@ public class DependencyDescriptor extends InjectionPoint implements Serializable

 	@Override
 	public int hashCode() {
-		return 31 * super.hashCode() + ObjectUtils.nullSafeHashCode(this.containingClass);
+		return (31 * super.hashCode() + ObjectUtils.nullSafeHashCode(this.containingClass));
 	}