Browse Source

Restore short-circuiting in equals implementation

Closes gh-24048
pull/24293/head
Juergen Hoeller 7 years ago
parent
commit
b5529f3f2b
  1. 44
      spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java

44
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java

@ -1162,28 +1162,28 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess @@ -1162,28 +1162,28 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
}
AbstractBeanDefinition that = (AbstractBeanDefinition) other;
boolean rtn = ObjectUtils.nullSafeEquals(getBeanClassName(), that.getBeanClassName());
rtn &= ObjectUtils.nullSafeEquals(this.scope, that.scope);
rtn &= this.abstractFlag == that.abstractFlag;
rtn &= this.lazyInit == that.lazyInit;
rtn &= this.autowireMode == that.autowireMode;
rtn &= this.dependencyCheck == that.dependencyCheck;
rtn &= Arrays.equals(this.dependsOn, that.dependsOn);
rtn &= this.autowireCandidate == that.autowireCandidate;
rtn &= ObjectUtils.nullSafeEquals(this.qualifiers, that.qualifiers);
rtn &= this.primary == that.primary;
rtn &= this.nonPublicAccessAllowed == that.nonPublicAccessAllowed;
rtn &= this.lenientConstructorResolution == that.lenientConstructorResolution;
rtn &= ObjectUtils.nullSafeEquals(this.constructorArgumentValues, that.constructorArgumentValues);
rtn &= ObjectUtils.nullSafeEquals(this.propertyValues, that.propertyValues);
rtn &= ObjectUtils.nullSafeEquals(this.methodOverrides, that.methodOverrides);
rtn &= ObjectUtils.nullSafeEquals(this.factoryBeanName, that.factoryBeanName);
rtn &= ObjectUtils.nullSafeEquals(this.factoryMethodName, that.factoryMethodName);
rtn &= ObjectUtils.nullSafeEquals(this.initMethodName, that.initMethodName);
rtn &= this.enforceInitMethod == that.enforceInitMethod;
rtn &= ObjectUtils.nullSafeEquals(this.destroyMethodName, that.destroyMethodName);
rtn &= this.enforceDestroyMethod == that.enforceDestroyMethod;
rtn &= this.synthetic == that.synthetic;
rtn &= this.role == that.role;
rtn = rtn && ObjectUtils.nullSafeEquals(this.scope, that.scope);
rtn = rtn && this.abstractFlag == that.abstractFlag;
rtn = rtn && this.lazyInit == that.lazyInit;
rtn = rtn && this.autowireMode == that.autowireMode;
rtn = rtn && this.dependencyCheck == that.dependencyCheck;
rtn = rtn && Arrays.equals(this.dependsOn, that.dependsOn);
rtn = rtn && this.autowireCandidate == that.autowireCandidate;
rtn = rtn && ObjectUtils.nullSafeEquals(this.qualifiers, that.qualifiers);
rtn = rtn && this.primary == that.primary;
rtn = rtn && this.nonPublicAccessAllowed == that.nonPublicAccessAllowed;
rtn = rtn && this.lenientConstructorResolution == that.lenientConstructorResolution;
rtn = rtn && ObjectUtils.nullSafeEquals(this.constructorArgumentValues, that.constructorArgumentValues);
rtn = rtn && ObjectUtils.nullSafeEquals(this.propertyValues, that.propertyValues);
rtn = rtn && ObjectUtils.nullSafeEquals(this.methodOverrides, that.methodOverrides);
rtn = rtn && ObjectUtils.nullSafeEquals(this.factoryBeanName, that.factoryBeanName);
rtn = rtn && ObjectUtils.nullSafeEquals(this.factoryMethodName, that.factoryMethodName);
rtn = rtn && ObjectUtils.nullSafeEquals(this.initMethodName, that.initMethodName);
rtn = rtn && this.enforceInitMethod == that.enforceInitMethod;
rtn = rtn && ObjectUtils.nullSafeEquals(this.destroyMethodName, that.destroyMethodName);
rtn = rtn && this.enforceDestroyMethod == that.enforceDestroyMethod;
rtn = rtn && this.synthetic == that.synthetic;
rtn = rtn && this.role == that.role;
return rtn && super.equals(other);
}

Loading…
Cancel
Save