You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@locus.apache.org on 2000/02/29 23:16:07 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/service/http HttpAdapter.java
mandar 00/02/29 14:16:07
Modified: src/share/org/apache/tomcat/server Tag: latest_TOMCAT_30
HttpServer.java
src/share/org/apache/tomcat/service/http Tag:
latest_TOMCAT_30 HttpAdapter.java
Log:
Bug fixes into the branch.
Connector attributes were not being set correctly.
Revision Changes Path
No revision
No revision
1.5.2.2 +26 -8 jakarta-tomcat/src/share/org/apache/tomcat/server/Attic/HttpServer.java
Index: HttpServer.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/server/Attic/HttpServer.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- HttpServer.java 2000/02/14 00:10:53 1.5.2.1
+++ HttpServer.java 2000/02/29 22:16:05 1.5.2.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/server/Attic/HttpServer.java,v 1.5.2.1 2000/02/14 00:10:53 mandar Exp $
- * $Revision: 1.5.2.1 $
- * $Date: 2000/02/14 00:10:53 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/server/Attic/HttpServer.java,v 1.5.2.2 2000/02/29 22:16:05 mandar Exp $
+ * $Revision: 1.5.2.2 $
+ * $Date: 2000/02/29 22:16:05 $
*
* ====================================================================
*
@@ -624,15 +624,33 @@
// Use props and CONNECTOR_PROP to load configuration info
// default is HttpServerConnector
addConnector( findDefaultConnector(props, getHostName(), getPort()) );
+ connector[0].setAttribute(VHOST_PORT, new Integer(getPort()));
+ connector[0].setAttribute(VHOST_ADDRESS, address);
+ connector[0].setAttribute(VHOST_NAME, getHostName());
}
+
for( int i=0; i<connector_count; i++ ) {
- connector[i].setAttribute(SERVER, this);
+ //if(connector[i].getAttribute(SERVER) == null)
+ //connector[i].setAttribute(SERVER, this);
+
connector[i].setContextManager( contextM );
- connector[i].setAttribute(VHOST_PORT, new Integer( getPort() ));
- connector[i].setAttribute(VHOST_ADDRESS, address);
- connector[i].setAttribute(SOCKET_FACTORY, factory);
- connector[i].setAttribute( VHOST_NAME, getHostName() );
+ //if(connector[i].getAttribute(VHOST_PORT) == null)
+ //connector[i].setAttribute(VHOST_PORT, new Integer( getPort() ));
+
+ //if(connector[i].getAttribute(VHOST_ADDRESS) == null)
+ //connector[i].setAttribute(VHOST_ADDRESS, address);
+
+ //if(connector[i].getAttribute(SOCKET_FACTORY) == null)
+ //connector[i].setAttribute(SOCKET_FACTORY, factory);
+
+ //if(connector[i].getAttribute(VHOST_NAME) == null)
+ //connector[i].setAttribute(VHOST_NAME, getHostName() );
}
}
}
+
+
+
+
+
No revision
No revision
1.2.2.1 +19 -5 jakarta-tomcat/src/share/org/apache/tomcat/service/http/Attic/HttpAdapter.java
Index: HttpAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/Attic/HttpAdapter.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- HttpAdapter.java 1999/11/12 23:24:24 1.2
+++ HttpAdapter.java 2000/02/29 22:16:07 1.2.2.1
@@ -1,9 +1,7 @@
-
-
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/Attic/HttpAdapter.java,v 1.2 1999/11/12 23:24:24 costin Exp $
- * $Revision: 1.2 $
- * $Date: 1999/11/12 23:24:24 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/Attic/HttpAdapter.java,v 1.2.2.1 2000/02/29 22:16:07 mandar Exp $
+ * $Revision: 1.2.2.1 $
+ * $Date: 2000/02/29 22:16:07 $
*
* ====================================================================
*
@@ -147,6 +145,22 @@
}
public Object getAttribute( String prop ) {
+
+ if(HttpServer.VHOST_NAME.equals(prop) ) {
+ return null;
+ }
+ if(HttpServer.VHOST_PORT.equals(prop) ) {
+ return new Integer(vport);
+ }
+ if(HttpServer.VHOST_ADDRESS.equals(prop)) {
+ return address;
+ }
+ if(HttpServer.SERVER.equals(prop)) {
+ return null;
+ }
+ if(HttpServer.SOCKET_FACTORY.equals(prop)) {
+ return socketFactory;
+ }
return null;
}