You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@locus.apache.org on 2000/04/15 00:48:07 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/service/connector ConnectorRequest.java MsgBuffer.java
costin 00/04/14 15:48:07
Modified: src/share/org/apache/tomcat/service/connector
ConnectorRequest.java MsgBuffer.java
Log:
Fixes to the java side of ajp23.
Revision Changes Path
1.6 +5 -4 jakarta-tomcat/src/share/org/apache/tomcat/service/connector/ConnectorRequest.java
Index: ConnectorRequest.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/ConnectorRequest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConnectorRequest.java 2000/01/15 23:30:24 1.5
+++ ConnectorRequest.java 2000/04/14 22:48:05 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/ConnectorRequest.java,v 1.5 2000/01/15 23:30:24 costin Exp $
- * $Revision: 1.5 $
- * $Date: 2000/01/15 23:30:24 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/ConnectorRequest.java,v 1.6 2000/04/14 22:48:05 costin Exp $
+ * $Revision: 1.6 $
+ * $Date: 2000/04/14 22:48:05 $
*
* ====================================================================
*
@@ -98,7 +98,8 @@
for( int i=0; i<envCount; i++ ) {
String n= msg.getString();
String v= msg.getString();
- env_vars.put( n , v );
+ if(n!=null && v!=null)
+ env_vars.put( n , v );
}
int hCount = msg.getInt();
1.4 +4 -4 jakarta-tomcat/src/share/org/apache/tomcat/service/connector/MsgBuffer.java
Index: MsgBuffer.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/MsgBuffer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MsgBuffer.java 2000/01/08 21:31:40 1.3
+++ MsgBuffer.java 2000/04/14 22:48:05 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/MsgBuffer.java,v 1.3 2000/01/08 21:31:40 rubys Exp $
- * $Revision: 1.3 $
- * $Date: 2000/01/08 21:31:40 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/MsgBuffer.java,v 1.4 2000/04/14 22:48:05 costin Exp $
+ * $Revision: 1.4 $
+ * $Date: 2000/04/14 22:48:05 $
*
* ====================================================================
*
@@ -160,7 +160,7 @@
public String getString() throws java.io.UnsupportedEncodingException {
int ll= getInt();
if( (ll == 0xFFFF) || (ll==-1) ) {
- System.out.println("null string " + ll);
+ // System.out.println("null string " + ll);
return null;
}
String s=BuffTool.getString( buff, pos, ll );