Author: nilsga Date: Tue Jan 22 00:25:58 2008 New Revision: 614140 URL: http://svn.apache.org/viewvc?rev=614140&view=rev Log: WW-2416 Serialize the request map, but filter out the value stack to reduce the verbosity of the output
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java?rev=614140&r1=614139&r2=614140&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java Tue Jan 22 00:25:58 2008 @@ -338,7 +338,8 @@ } } writer.endNode(); - serializeIt(ctx.getSession(), "request", writer, new ArrayList<Object>()); + Map requestMap = (Map) ctx.get("request"); + serializeIt(requestMap, "request", writer, filterValueStack(requestMap)); serializeIt(ctx.getSession(), "session", writer, new ArrayList<Object>()); ValueStack stack = (ValueStack) ctx.get(ActionContext.VALUE_STACK); @@ -445,6 +446,15 @@ this.enableXmlWithConsole = enableXmlWithConsole; } + + private List<Object> filterValueStack(Map requestMap) { + List<Object> filter = new ArrayList<Object>(); + Object valueStack = requestMap.get("struts.valueStack"); + if(valueStack != null) { + filter.add(valueStack); + } + return filter; + } }