Handle null condition for locale in OrganizationTypeConfigurationModelListener.java

• Type: Bug
• Status: Verified
• Resolution: Unresolved
• Affects Version/s: 7.2.X, Master
• Fix Version/s: None
• Component/s: Portal Configuration
• Labels:
  • ee-ts
• Fix Priority: 3
• Git Pull Request: https://github.com/shuyangzhou/liferay-portal/pull/9208

Calling to

ResourceBundleUtil.getBundle("content.Language", LocaleThreadLocal.getThemeDisplayLocale(), getClass());

causes a NPE when

LocaleThreadLocal.getThemeDisplayLocale()

is null:

Caused by: java.lang.NullPointerException
        at java.base/java.util.ResourceBundle.getBundleImpl(ResourceBundle.java:1618)
        at java.base/java.util.ResourceBundle.getBundleImpl(ResourceBundle.java:1593)
        at java.base/java.util.ResourceBundle.getBundle(ResourceBundle.java:1509)
        at com.liferay.portal.kernel.util.ResourceBundleUtil._getBundle(ResourceBundleUtil.java:242)
        at com.liferay.portal.kernel.util.ResourceBundleUtil.getBundle(ResourceBundleUtil.java:96)
        at com.liferay.portal.kernel.util.ResourceBundleUtil.getBundle(ResourceBundleUtil.java:88)
        at com.liferay.organizations.internal.configuration.persistence.listener.OrganizationTypeConfigurationModelListener._getResourceBundle(OrganizationTypeConfigurationModelListener.java:62)
        at com.liferay.organizations.internal.configuration.persistence.listener.OrganizationTypeConfigurationModelListener._validateUniqueConfiguration(OrganizationTypeConfigurationModelListener.java:100)
        at com.liferay.organizations.internal.configuration.persistence.listener.OrganizationTypeConfigurationModelListener.onBeforeSave(OrganizationTypeConfigurationModelListener.java:52)
        ... 69 more