Skip to content

Commit

Permalink
LPD-15841 Rename
Browse files Browse the repository at this point in the history
  • Loading branch information
brianchandotcom committed Jan 30, 2024
1 parent 67b5d07 commit e9dfa0c
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions portal-impl/src/com/liferay/portal/bean/BeanPropertiesImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -418,22 +418,22 @@ public Class<?> getObjectType(Object bean, String param) {
public Class<?> getObjectType(
Object bean, String param, Class<?> defaultValue) {

Class<?> beanType = null;
Class<?> clazz = null;

if (bean != null) {
try {
beanType = _getPropertyType(bean, param);
clazz = _getPropertyClass(bean, param);
}
catch (Exception exception) {
_log.error(exception);
}
}

if (beanType == null) {
if (clazz == null) {
return defaultValue;
}

return beanType;
return clazz;
}

@Override
Expand All @@ -445,11 +445,11 @@ public Class<?> getObjectTypeSilent(Object bean, String param) {
public Class<?> getObjectTypeSilent(
Object bean, String param, Class<?> defaultValue) {

Class<?> beanType = null;
Class<?> clazz = null;

if (bean != null) {
try {
beanType = _getPropertyType(bean, param);
clazz = _getPropertyClass(bean, param);
}
catch (Exception exception) {
if (_log.isDebugEnabled()) {
Expand All @@ -458,11 +458,11 @@ public Class<?> getObjectTypeSilent(
}
}

if (beanType == null) {
if (clazz == null) {
return defaultValue;
}

return beanType;
return clazz;
}

@Override
Expand Down Expand Up @@ -598,10 +598,10 @@ public void setProperties(
continue;
}

Class<?> propertyTypeClass = _getPropertyType(bean, dateParam);
Class<?> propertyClass = _getPropertyClass(bean, dateParam);

if ((propertyTypeClass == null) ||
!propertyTypeClass.equals(Date.class)) {
if ((propertyClass == null) ||
!propertyClass.equals(Date.class)) {

continue;
}
Expand Down Expand Up @@ -680,7 +680,7 @@ protected Date getDate(
}
}

private Class<?> _getPropertyType(Object bean, String param) {
private Class<?> _getPropertyClass(Object bean, String param) {
AutoEscapeBeanHandler autoEscapeBeanHandler =
ProxyUtil.fetchInvocationHandler(bean, AutoEscapeBeanHandler.class);

Expand Down

0 comments on commit e9dfa0c

Please sign in to comment.