Unable to modify site pages when a logo is defined

• Type: Bug
• Status: Closed
• Resolution: Fixed
• Affects Version/s: 6.1.0 CE GA1, 6.1.10 EE GA1, 6.2.0 CE M2
• Fix Version/s: 6.1.10 EE GA1, 6.1.20 EE GA2, --Sprint 11/12, 6.2.0 CE M2
• Component/s: ~ [Archived] Sites Management
• Labels:
  • QA-R
• Branch Version/s:
  6.1.x
• Backported to Branch:
  Committed
• Caused by: Other bug fix
• Added to Fix Pack:
  Added
• Git Pull Request: https://github.com/brianchandotcom/liferay-portal/pull/4616

go to Control Panel
Portal Settings
Display Settings
Change the logo to anything (probably not required to reproduce)
UNCHECK Allow site administrators to use their own logo?
Save

go to Site Pages for ANY site
Click Save, no changes required.

Portlet unavailable

00:05:56,563 ERROR [render_portlet_jsp:154] java.lang.NullPointerException
at com.liferay.portlet.layoutsadmin.action.EditLayoutSetAction.updateLogo(EditLayoutSetAction.java:209)
at com.liferay.portlet.layoutsadmin.action.EditLayoutSetAction.updateLayoutSet(EditLayoutSetAction.java:170)
at com.liferay.portlet.layoutsadmin.action.EditLayoutSetAction.processAction(EditLayoutSetAction.java:80)
at com.liferay.portal.struts.PortletRequestProcessor.process(PortletRequestProcessor.java:175)
at com.liferay.portlet.StrutsPortlet.processAction(StrutsPortlet.java:190)
at com.liferay.portlet.FilterChainImpl.doFilter(FilterChainImpl.java:70)
at com.liferay.portal.kernel.portlet.PortletFilterUtil.doFilter(PortletFilterUtil.java:48)
at com.liferay.portlet.InvokerPortletImpl.invoke(InvokerPortletImpl.java:651)
at com.liferay.portlet.InvokerPortletImpl.invokeAction(InvokerPortletImpl.java:686)
at com.liferay.portlet.InvokerPortletImpl.processAction(InvokerPortletImpl.java:361)
at com.liferay.portal.action.LayoutAction.processPortletRequest(LayoutAction.java:856)
at com.liferay.portal.action.LayoutAction.processLayout(LayoutAction.java:635)
at com.liferay.portal.action.LayoutAction.execute(LayoutAction.java:246)
at org.apache.struts.action.RequestProcessor.processActionPerform(RequestProcessor.java:431)
at org.apache.struts.action.RequestProcessor.process(RequestProcessor.java:236)
at com.liferay.portal.struts.PortalRequestProcessor.process(PortalRequestProcessor.java:174)
at org.apache.struts.action.ActionServlet.process(ActionServlet.java:1196)
at org.apache.struts.action.ActionServlet.doPost(ActionServlet.java:432)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:641)
at com.liferay.portal.servlet.MainServlet.callParentService(MainServlet.java:538)