Dolda2000 GitWeb
/
jsvc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a VM shutdown hook in DirServer to shut down contexts properly.
[jsvc.git]
/
src
/
dolda
/
jsvc
/
j2ee
/
J2eeRequest.java
diff --git
a/src/dolda/jsvc/j2ee/J2eeRequest.java
b/src/dolda/jsvc/j2ee/J2eeRequest.java
index
6b1ba0b
..
9056e77
100644
(file)
--- 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 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;
public J2eeRequest(ServletConfig cfg, HttpServletRequest req, HttpServletResponse resp) {
this.cfg = cfg;
@@
-60,7
+59,7
@@
public class J2eeRequest extends ResponseBuffer {
q = "";
try {
url = new URL(scheme, host, port, req.getContextPath() + req.getServletPath() + pi + q);
q = "";
try {
url = new URL(scheme, host, port, req.getContextPath() + req.getServletPath() + pi + q);
- context = new URL(scheme, host, port, req.getContextPath());
+ context = new URL(scheme, host, port, req.getContextPath()
+ "/"
);
} catch(MalformedURLException e) {
throw(new Error(e));
}
} catch(MalformedURLException e) {
throw(new Error(e));
}
@@
-71,10
+70,6
@@
public class J2eeRequest extends ResponseBuffer {
path = path.substring(1);
}
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. */
public SocketAddress remoteaddr() {
try {
/* Apparently getRemotePort returns -1 when running on Tomcat over AJP. */
@@
-149,14
+144,8
@@
public class J2eeRequest extends ResponseBuffer {
}
public MultiMap<String, String> params() {
}
public MultiMap<String, String> params() {
- if(params == null) {
- params = Params.urlparams(this);
- if(method == "POST") {
- MultiMap<String, String> pp = Params.postparams(this);
- if(pp != null)
- params.putAll(pp);
- }
- }
+ if(params == null)
+ params = Params.stdparams(this);
return(params);
}
return(params);
}