From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Mon, 19 Oct 2009 13:40:24 +0000 (+0200)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/jsvc
X-Git-Url: http://dolda2000.com/gitweb/?p=jsvc.git;a=commitdiff_plain;h=8becf9405020bb30b4b339ce954697faee99606b;hp=5cdd61df59fc87e9f8dbbfb0f1ea1c535a3694f9

Merge branch 'master' of git.dolda2000.com:/srv/git/r/jsvc
---

diff --git a/src/dolda/jsvc/Request.java b/src/dolda/jsvc/Request.java
index c0210e6..af14293 100644
--- a/src/dolda/jsvc/Request.java
+++ b/src/dolda/jsvc/Request.java
@@ -22,7 +22,6 @@ public interface Request {
     public MultiMap<String, String> outheaders();
     
     /* Misc. */
-    public Map<Object, Object> props();
     public ServerContext ctx();
     public SocketAddress remoteaddr();
     public SocketAddress localaddr();
diff --git a/src/dolda/jsvc/RequestWrap.java b/src/dolda/jsvc/RequestWrap.java
index d024622..8c711bb 100644
--- a/src/dolda/jsvc/RequestWrap.java
+++ b/src/dolda/jsvc/RequestWrap.java
@@ -23,7 +23,6 @@ public class RequestWrap implements Request {
     public void status(int code) {bk.status(code);}
     public void status(int code, String message) {bk.status(code, message);}
     public MultiMap<String, String> outheaders() {return(bk.outheaders());}
-    public Map<Object, Object> props() {return(bk.props());}
     public ServerContext ctx() {return(bk.ctx());}
     public SocketAddress remoteaddr() {return(bk.remoteaddr());}
     public SocketAddress localaddr() {return(bk.localaddr());}
diff --git a/src/dolda/jsvc/j2ee/J2eeRequest.java b/src/dolda/jsvc/j2ee/J2eeRequest.java
index 6b1ba0b..466b81c 100644
--- a/src/dolda/jsvc/j2ee/J2eeRequest.java
+++ b/src/dolda/jsvc/j2ee/J2eeRequest.java
@@ -15,7 +15,6 @@ public class J2eeRequest extends ResponseBuffer {
     private String method, path;
     private URL url, context;
     private MultiMap<String, String> params = null;
-    private Map<Object, Object> props = new HashMap<Object, Object>();
     
     public J2eeRequest(ServletConfig cfg, HttpServletRequest req, HttpServletResponse resp) {
 	this.cfg = cfg;
@@ -71,10 +70,6 @@ public class J2eeRequest extends ResponseBuffer {
 	    path = path.substring(1);
     }
     
-    public Map<Object, Object> props() {
-	return(props);
-    }
-    
     public SocketAddress remoteaddr() {
 	try {
 	    /* Apparently getRemotePort returns -1 when running on Tomcat over AJP. */