amyroh 02/05/16 13:05:50
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
SaveConnectorAction.java
Log:
Minor fix to only set proxy name, keystore file name and keystore password
when a user enters values. Currently it was still setting these values
because they're never null.
Revision Changes Path
1.11 +7 -7
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
Index: SaveConnectorAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SaveConnectorAction.java 14 May 2002 23:30:30 -0000 1.10
+++ SaveConnectorAction.java 16 May 2002 20:05:50 -0000 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v
1.10 2002/05/14 23:30:30 manveen Exp $
- * $Revision: 1.10 $
- * $Date: 2002/05/14 23:30:30 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v
1.11 2002/05/16 20:05:50 amyroh Exp $
+ * $Revision: 1.11 $
+ * $Date: 2002/05/16 20:05:50 $
*
* ====================================================================
*
@@ -95,7 +95,7 @@
* <em>Edit Connector</em> transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.10 $ $Date: 2002/05/14 23:30:30 $
+ * @version $Revision: 1.11 $ $Date: 2002/05/16 20:05:50 $
*/
public final class SaveConnectorAction extends Action {
@@ -341,7 +341,7 @@
if (!("AJP".equalsIgnoreCase(connectorType))) {
attribute = "proxyName";
String proxyName = cform.getProxyName();
- if ((proxyName != null) || (proxyName.length()>0)) {
+ if ((proxyName != null) && (proxyName.length()>0)) {
mBServer.setAttribute(coname,
new Attribute("proxyName", proxyName));
}
@@ -366,13 +366,13 @@
attribute = "keystoreFile";
String keyFile = cform.getKeyStoreFileName();
- if ((keyFile != null) || (keyFile.length()>0))
+ if ((keyFile != null) && (keyFile.length()>0))
mBServer.setAttribute(coname,
new Attribute("keystoreFile", keyFile));
attribute = "keystorePass";
String keyPass = cform.getKeyStorePassword();
- if ((keyPass != null) || (keyPass.length()>0))
+ if ((keyPass != null) && (keyPass.length()>0))
mBServer.setAttribute(coname,
new Attribute("keystorePass", keyPass));
// request.setAttribute("warning", "connector.keyPass.warning");
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
