Comparing Adobe-Consulting-Services/acs-aem-commons b0d750e..35271cb

View on GitHub
3 changed files with 5 additions and 4 deletions.
+1, -1•bundle/src/main/java/com/adobe/acs/commons/wcm/impl/ComponentErrorHandlerImpl.java
@@ -193,7 +193,7 @@ public class ComponentErrorHandlerImpl implements ComponentErrorHandler, Filter
public final void doFilter(ServletRequest servletRequest, ServletResponse servletResponse,
FilterChain chain) throws IOException, ServletException {
// We are in a Sling Filter, so these request/response objects are guarenteed to be of type Sling...
// We are in a Sling Filter, so these request/response objects are guaranteed to be of type Sling...
final SlingHttpServletRequest request = (SlingHttpServletRequest) servletRequest;
final SlingHttpServletResponse response = (SlingHttpServletResponse) servletResponse;
+1, -1•bundle/src/test/java/com/adobe/acs/commons/util/RunnableOnMasterTest.java
@@ -37,7 +37,7 @@ public class RunnableOnMasterTest {
InstanceDescription instanceDescription = mock(InstanceDescription.class);
when(te.getNewView()).thenReturn(view);
when(view.getLocalInstance()).thenReturn(instanceDescription);
when(instanceDescription.isLeader()).thenReturn(true);
when(instanceDescription.isLeader()).thenReturn(isLeader);
return te;
}
+3, -2•bundle/src/test/java/com/adobe/acs/commons/wcm/impl/ComponentErrorHandlerImplTest.java
@@ -23,6 +23,7 @@ package com.adobe.acs.commons.wcm.impl;
import com.adobe.acs.commons.util.ModeUtil;
import com.adobe.acs.commons.wcm.ComponentErrorHandler;
import com.adobe.acs.commons.wcm.ComponentHelper;
import com.day.cq.wcm.api.WCMMode;
import com.day.cq.wcm.api.components.Component;
import com.day.cq.wcm.api.components.ComponentContext;
import org.apache.sling.api.SlingHttpServletRequest;
@@ -179,9 +180,9 @@ public class ComponentErrorHandlerImplTest {
@Test
public void testEditError() throws Exception {
when(componentContext.isRoot()).thenReturn(false);
when(ModeUtil.isEdit(request)).thenReturn(true);
when(request.getAttribute(WCMMode.class.getName())).thenReturn(WCMMode.EDIT);
doThrow(new ServletException()).when(chain).doFilter(request, response);
doThrow(new ServletException("Should not delegate to chained filters")).when(chain).doFilter(request, response);
handler.doFilter(request, response, chain);