Author: mbenson
Date: Wed Nov 23 07:44:01 2005
New Revision: 348465
URL: http://svn.apache.org/viewcvs?rev=348465&view=rev
Log:
> 1 ssh invocations to a given host would fail. Bugzilla report 36207.
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewcvs/ant/core/trunk/WHATSNEW?rev=348465&r1=348464&r2=348465&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Wed Nov 23 07:44:01 2005
@@ -159,9 +159,11 @@
causing impossibility to process XML entities referenced by XML
documents in non ASCII paths. Bugzilla report 37348.
+* > 1 ssh invocations to a given host would fail. Bugzilla report 36207.
+
Other changes:
--------------
-* Fixed references to obsoleted CVS web site. Burzilla Report 36854.
+* Fixed references to obsoleted CVS web site. Bugzilla Report 36854.
* Log fine-grained events at verbose level from JUnit. Bugzilla report 31885.
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java
URL:
http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java?rev=348465&r1=348464&r2=348465&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java
Wed Nov 23 07:44:01 2005
@@ -29,7 +29,6 @@
private String password = null;
private String keyfile;
private String passphrase = null;
- private boolean firstTime = true;
private boolean trustAllCertificates;
/** Constructor for SSHUserInfo. */
@@ -154,9 +153,8 @@
this.keyfile = keyfile;
}
- // (NOTE: this method does not seem to be called
/**
- * Whether to prompt for a passphase.
+ * Implement the UserInfo interface.
* @param message ignored
* @return true always
*/
@@ -164,35 +162,27 @@
return true;
}
- // (NOTE: this method does not seem to be called
/**
- * Whether to prompt for a password.
+ * Implement the UserInfo interface.
* @param passwordPrompt ignored
* @return true the first time this is called, false otherwise
*/
public boolean promptPassword(String passwordPrompt) {
- //log(passwordPrompt, Project.MSG_DEBUG);
- if (firstTime) {
- firstTime = false;
- return true;
- }
- return firstTime;
+ return true;
}
- // (NOTE: this method does not seem to be called
/**
- * Whether to prompt yes or no.
+ * Implement the UserInfo interface.
* @param message ignored
* @return the value of trustAllCertificates
*/
public boolean promptYesNo(String message) {
- //log(prompt, Project.MSG_DEBUG);
return trustAllCertificates;
}
- // (NOTE: this method does not seem to be called
+//why do we do nothing?
/**
- * Do nothing.
+ * Implement the UserInfo interface (noop).
* @param message ignored
*/
public void showMessage(String message) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
