[picocontainer-scm] [5674] java/2.x/trunk/web/web-remoting/src/java/org/picocontainer/web/remoting/AbstractPicoWebRemotingServlet.java: PICO-360 fixed courtesy of Johann Burkard - THX RYLY

Revision 5674
Author paul
Date 2010-04-13 07:56:19 -0500 (Tue, 13 Apr 2010)

Log Message

PICO-360 fixed courtesy of Johann Burkard - THX RYLY

Modified Paths

- java/2.x/trunk/web/web-remoting/src/java/org/picocontainer/web/remoting/AbstractPicoWebRemotingServlet.java

Diff

Modified: java/2.x/trunk/web/web-remoting/src/java/org/picocontainer/web/remoting/AbstractPicoWebRemotingServlet.java (5673 => 5674)

--- java/2.x/trunk/web/web-remoting/src/java/org/picocontainer/web/remoting/AbstractPicoWebRemotingServlet.java 2010-03-30 22:45:03 UTC (rev 5673)
+++ java/2.x/trunk/web/web-remoting/src/java/org/picocontainer/web/remoting/AbstractPicoWebRemotingServlet.java 2010-04-13 12:56:19 UTC (rev 5674)
@@ -8,6 +8,7 @@
package org.picocontainer.web.remoting;

import java.io.IOException;
+import java.io.PrintWriter;
import java.lang.reflect.Member;

import javax.servlet.ServletConfig;
@@ -66,14 +67,17 @@

public static class ServletFilter extends PicoServletContainerFilter {

+ @Override
protected void setAppContainer(MutablePicoContainer container) {
currentAppContainer.set(container);
}

+ @Override
protected void setRequestContainer(MutablePicoContainer container) {
currentRequestContainer.set(container);
}

+ @Override
protected void setSessionContainer(MutablePicoContainer container) {
currentSessionContainer.set(container);
}
@@ -154,11 +158,10 @@
private boolean initialized;

protected abstract XStream createXStream();
-
- protected void service(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
- long b4 = System.currentTimeMillis();

+ @Override
+ protected void service(HttpServletRequest request, HttpServletResponse response)
+ throws IOException {
if (!initialized) {
publishAdapters();
initialized = true;
@@ -172,28 +175,9 @@

final String httpMethod = request.getMethod();

- final String[] cacheKey = new String[1];
- final String[] cached = new String[1];
- final long[] time = new long[1];
-
- long str = System.currentTimeMillis();
-
- //final Cache cache = currentAppContainer.get().getComponent(Cache.class);
-
String result = pwr.processRequest(pathInfo, currentRequestContainer.get(), httpMethod, new NullComponentMonitor() {
+ @Override
public Object invoking(PicoContainer container, ComponentAdapter<?> componentAdapter, Member member, Object instance, Object[] args) {
- if (httpMethod.equals(GET)) {
- StringBuilder sb = new StringBuilder().append(OPEN).append(request.getRequestURI())
- .append(SLASH).append(instance.toString()).append(CLOSE).append(member.getName());
- appendArgsAsString(sb, args);
- cacheKey[0] = sb.toString();
-// cached[0] = (String) cache.get((Object)cacheKey[0]);
-// if (cached[0] != null) {
-// time[0] = System.currentTimeMillis();
-// return null;
-// }
- }
- time[0] = System.currentTimeMillis();
return ComponentMonitor.KEEP;
}

@@ -201,19 +185,9 @@
}
});

- String duration = ", duration = " + (System.currentTimeMillis() - str) + "ms ";
-
- if (httpMethod.equals(GET)) {
-// if (cached[0] != null) {
-// result = cached[0];
-// } else {
-// cache.put(cacheKey[0], result);
-// }
- }
-
- ServletOutputStream outputStream = response.getOutputStream();
+ PrintWriter writer = response.getWriter();
if (result != null) {
- outputStream.print(result);
+ writer.print(result);
} else {
response.sendError(400, "Nothing is mapped to this URL, try removing the last term for directory list.");
}
@@ -226,7 +200,7 @@
}
}

-
+ @Override
public void init(ServletConfig servletConfig) throws ServletException {
this.xstream = createXStream();
String packagePrefixToStrip = servletConfig.getInitParameter(PACKAGE_PREFIX_TO_STRIP);

----------

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email