diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/websphere/WebSphere700ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/websphere/WebSphere700ContainerTest.java index 6f1d0ec7..609d8834 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/websphere/WebSphere700ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/websphere/WebSphere700ContainerTest.java @@ -1,5 +1,6 @@ package com.reajason.javaweb.integration.websphere; +import com.reajason.javaweb.memshell.WebSphereShell; import com.reajason.javaweb.memshell.config.Constants; import com.reajason.javaweb.memshell.config.Server; import com.reajason.javaweb.memshell.config.ShellTool; @@ -44,18 +45,18 @@ public class WebSphere700ContainerTest { static Stream casesProvider() { return Stream.of( - arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP) -// arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Command, Packer.INSTANCE.AgentJar), -// arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Behinder, Packer.INSTANCE.AgentJar), -// arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Godzilla, Packer.INSTANCE.AgentJar) +// arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP), +// arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP), +// arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP), +// arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP), +// arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP), +// arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP), +// arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP), +// arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP), +// arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP), + arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Command, Packer.INSTANCE.AgentJar), + arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Behinder, Packer.INSTANCE.AgentJar), + arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Godzilla, Packer.INSTANCE.AgentJar) ); } diff --git a/memshell/src/main/java/com/reajason/javaweb/memshell/websphere/injector/WebSphereFilterChainAgentInjector.java b/memshell/src/main/java/com/reajason/javaweb/memshell/websphere/injector/WebSphereFilterChainAgentInjector.java index 21381ff2..5a2bd755 100644 --- a/memshell/src/main/java/com/reajason/javaweb/memshell/websphere/injector/WebSphereFilterChainAgentInjector.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/websphere/injector/WebSphereFilterChainAgentInjector.java @@ -33,7 +33,7 @@ public class WebSphereFilterChainAgentInjector implements AgentBuilder.Transform TypeDescription typeDescription, ClassLoader classLoader, JavaModule module, ProtectionDomain protectionDomain) { - return builder.visit(Advice.to(interceptorClass).on(named("invokeFilters"))); + return builder.visit(Advice.to(interceptorClass).on(named("doFilter"))); } public static void premain(String args, Instrumentation inst) throws Exception { @@ -58,6 +58,6 @@ public class WebSphereFilterChainAgentInjector implements AgentBuilder.Transform .type(named("com.ibm.ws.webcontainer.filter.WebAppFilterManager")) .transform(new WebSphereFilterChainAgentInjector()) .installOn(inst); - System.out.println("MemShell Agent is working at com.ibm.ws.webcontainer.filter.WebAppFilterManager.invokeFilters"); + System.out.println("MemShell Agent is working at com.ibm.ws.webcontainer.filter.WebAppFilterManager.doFilter"); } } \ No newline at end of file