Skip to content

Commit

Permalink
LPS-199494 Replace ServiceProxyFactory with Snapshot in class Organiz…
Browse files Browse the repository at this point in the history
…ationImpl
  • Loading branch information
Jiaxu Wei authored and brianchandotcom committed Oct 23, 2023
1 parent 5a3440c commit 0ae7d67
Showing 1 changed file with 8 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import com.liferay.portal.kernel.model.Group;
import com.liferay.portal.kernel.model.Organization;
import com.liferay.portal.kernel.model.OrganizationConstants;
import com.liferay.portal.kernel.module.service.Snapshot;
import com.liferay.portal.kernel.service.AddressLocalServiceUtil;
import com.liferay.portal.kernel.service.GroupLocalServiceUtil;
import com.liferay.portal.kernel.service.OrganizationLocalServiceUtil;
Expand All @@ -24,7 +25,6 @@
import com.liferay.portal.kernel.util.LocalizationUtil;
import com.liferay.portal.kernel.util.PortalUtil;
import com.liferay.portal.kernel.util.PortletKeys;
import com.liferay.portal.kernel.util.ServiceProxyFactory;
import com.liferay.portal.kernel.util.SetUtil;
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.URLCodec;
Expand Down Expand Up @@ -197,7 +197,10 @@ public String getLogoURL() {
sb.append("/organization_logo?img_id=");
sb.append(getLogoId());

if (_userFileUploadsSettings.isImageCheckToken()) {
UserFileUploadsSettings userFileUploadsSettings =
_userFileUploadsSettingsSnapshot.get();

if (userFileUploadsSettings.isImageCheckToken()) {
sb.append("&img_id_token=");
sb.append(URLCodec.encodeURL(DigesterUtil.digest(getUuid())));
}
Expand Down Expand Up @@ -371,9 +374,8 @@ public boolean isRoot() {
private static final Log _log = LogFactoryUtil.getLog(
OrganizationImpl.class);

private static volatile UserFileUploadsSettings _userFileUploadsSettings =
ServiceProxyFactory.newServiceTrackedInstance(
UserFileUploadsSettings.class, OrganizationImpl.class,
"_userFileUploadsSettings", false);
private static final Snapshot<UserFileUploadsSettings>
_userFileUploadsSettingsSnapshot = new Snapshot<>(
OrganizationImpl.class, UserFileUploadsSettings.class);

}

0 comments on commit 0ae7d67

Please sign in to comment.