remm 2003/01/29 12:03:21
Modified: util/java/org/apache/tomcat/util/http/mapper Mapper.java
MappingData.java
Log:
- Also compute a request path field.
Revision Changes Path
1.3 +9 -1
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java
Index: Mapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Mapper.java 29 Jan 2003 12:45:33 -0000 1.2
+++ Mapper.java 29 Jan 2003 20:03:21 -0000 1.3
@@ -494,6 +494,8 @@
&& (path.equals(extensionWrappers[pos].name))) {
mappingData.wrapperPath.setChars
(buf, servletPath, pathEnd - servletPath);
+ mappingData.requestPath.setChars
+ (buf, servletPath, pathEnd - servletPath);
mappingData.wrapper = extensionWrappers[pos].object;
}
path.setOffset(servletPath);
@@ -538,6 +540,8 @@
if (mappingData.wrapper == null) {
if (context.defaultWrapper != null) {
mappingData.wrapper = context.defaultWrapper.object;
+ mappingData.requestPath.setChars
+ (path.getBuffer(), path.getStart(), path.getLength());
mappingData.wrapperPath.setChars
(path.getBuffer(), path.getStart(), path.getLength());
}
@@ -556,6 +560,7 @@
(Wrapper[] wrappers, CharChunk path, MappingData mappingData) {
int pos = find(wrappers, path);
if ((pos != -1) && (path.equals(wrappers[pos].name))) {
+ mappingData.requestPath.setString(wrappers[pos].name);
mappingData.wrapperPath.setString(wrappers[pos].name);
mappingData.wrapper = wrappers[pos].object;
}
@@ -590,6 +595,8 @@
path.getOffset() + length,
path.getLength() - length);
}
+ mappingData.requestPath.setChars
+ (path.getBuffer(), path.getOffset(), path.getLength());
mappingData.wrapper = wrappers[pos].object;
}
}
@@ -865,7 +872,7 @@
MessageBytes host = MessageBytes.newInstance();
host.setString("iowejoiejfoiew");
MessageBytes uri = MessageBytes.newInstance();
- uri.setString("/foo/bar/blah/");
+ uri.setString("/foo/bar/blah/bobou/foo");
uri.toChars();
uri.getCharChunk().setLimit(-1);
@@ -908,6 +915,7 @@
System.out.println("contextPath:" + mappingData.contextPath);
System.out.println("wrapperPath:" + mappingData.wrapperPath);
+ System.out.println("requestPath:" + mappingData.requestPath);
System.out.println("pathInfo:" + mappingData.pathInfo);
System.out.println("redirectPath:" + mappingData.redirectPath);
1.2 +2 -0
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/MappingData.java
Index: MappingData.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/MappingData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MappingData.java 28 Jan 2003 18:14:51 -0000 1.1
+++ MappingData.java 29 Jan 2003 20:03:21 -0000 1.2
@@ -73,6 +73,7 @@
public Object wrapper = null;
public MessageBytes contextPath = MessageBytes.newInstance();
+ public MessageBytes requestPath = MessageBytes.newInstance();
public MessageBytes wrapperPath = MessageBytes.newInstance();
public MessageBytes pathInfo = MessageBytes.newInstance();
@@ -83,6 +84,7 @@
context = null;
wrapper = null;
pathInfo.recycle();
+ requestPath.recycle();
wrapperPath.recycle();
contextPath.recycle();
redirectPath.recycle();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
