oglueck 2003/11/06 23:34:34 Modified: httpclient API_CHANGES_2_1.txt httpclient/src/java/org/apache/commons/httpclient/protocol Protocol.java Log: fixed design error: uniform Protocol constructor for all factories Revision Changes Path 1.4 +2 -0 jakarta-commons/httpclient/API_CHANGES_2_1.txt Index: API_CHANGES_2_1.txt =================================================================== RCS file: /home/cvs/jakarta-commons/httpclient/API_CHANGES_2_1.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- API_CHANGES_2_1.txt 18 Sep 2003 13:56:21 -0000 1.3 +++ API_CHANGES_2_1.txt 7 Nov 2003 07:34:34 -0000 1.4 @@ -31,3 +31,5 @@ state of DigestScheme: - createDigest(String, String) - createDigestHeader(String, String) + +* There is only one Protocol constructor for both secure and insecure socket factories. 1.6 +6 -32 jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/protocol/Protocol.java Index: Protocol.java =================================================================== RCS file: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/protocol/Protocol.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Protocol.java 31 Jan 2003 00:33:36 -0000 1.5 +++ Protocol.java 7 Nov 2003 07:34:34 -0000 1.6 @@ -194,7 +194,8 @@ private boolean secure; /** - * Constructs a new Protocol. The created protcol is insecure. + * Constructs a new Protocol. If the created protocol is secure depends on + * the class of <code>factory</code>. * * @param scheme the scheme (e.g. http, https) * @param factory the factory for creating sockets for communication using @@ -216,36 +217,9 @@ this.scheme = scheme; this.socketFactory = factory; this.defaultPort = defaultPort; - this.secure = false; + this.secure = (factory instanceof SecureProtocolSocketFactory); } - /** - * Constructs a new Protocol. The created protcol is secure. - * - * @param scheme the scheme (e.g. http, https) - * @param factory the factory for creating sockets for communication using - * this protocol - * @param defaultPort the port this protocol defaults to - */ - public Protocol(String scheme, - SecureProtocolSocketFactory factory, int defaultPort) { - - if (scheme == null) { - throw new IllegalArgumentException("scheme is null"); - } - if (factory == null) { - throw new IllegalArgumentException("socketFactory is null"); - } - if (defaultPort <= 0) { - throw new IllegalArgumentException("port is invalid: " + defaultPort); - } - - this.scheme = scheme; - this.socketFactory = factory; - this.defaultPort = defaultPort; - this.secure = true; - } - /** * Returns the defaultPort. * @return int
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]