DefaultRestoreViewSupport.calculateViewId does not calculate viewId properly on portlet case

Testing the helloworld portlet archetype on liferay for many, many hours, I have seen a problem with the way it is resolved the view id

In this configuration, the current algorithm resolves the view id using

javax.servlet.include.path_info

and

javax.servlet.include.servlet_path

But in portlet case, this values should not be taken into account. Instead, we have to check if this is a portlet request or not (it seems javax.portlet.faces.PORTLET_LIFECYCLE_PHASE is used to check if is a portlet request or not) and call:

org.apache.myfaces.portlet.faces.context.PortletExternalContextImpl.getRequestPathInfo() or getRequestContextPath() when necessary.