Dolda2000 GitWeb
/
jsvc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.dolda2000.com:/srv/git/r/jsvc
[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
574355f
..
466b81c
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;
@@
-71,13
+70,13
@@
public class J2eeRequest extends ResponseBuffer {
path = path.substring(1);
}
path = path.substring(1);
}
- public Map<Object, Object> props() {
- return(props);
- }
-
public SocketAddress remoteaddr() {
try {
public SocketAddress remoteaddr() {
try {
- return(new InetSocketAddress(InetAddress.getByName(req.getRemoteAddr()), req.getRemotePort()));
+ /* Apparently getRemotePort returns -1 when running on Tomcat over AJP. */
+ int port = req.getRemotePort();
+ if(port < 0)
+ port = 0;
+ return(new InetSocketAddress(InetAddress.getByName(req.getRemoteAddr()), port));
} catch(UnknownHostException e) {
/* req.getRemoteAddr should always be a valid IP address,
* so this should never happen. */
} catch(UnknownHostException e) {
/* req.getRemoteAddr should always be a valid IP address,
* so this should never happen. */