Author: sebb
Date: Thu Jan 5 19:07:55 2012
New Revision: 1227768
URL: http://svn.apache.org/viewvc?rev=1227768&view=rev
Log:
NET-430 Can't login to POP3S Server using explicit mode
Modified:
commons/proper/net/trunk/src/changes/changes.xml
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3SClient.java
Modified: commons/proper/net/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/changes/changes.xml?rev=1227768&r1=1227767&r2=1227768&view=diff
==============================================================================
--- commons/proper/net/trunk/src/changes/changes.xml (original)
+++ commons/proper/net/trunk/src/changes/changes.xml Thu Jan 5 19:07:55 2012
@@ -59,6 +59,9 @@ The <action> type attribute can be add,u
<release version="3.1-SNAPSHOT" date="TBA" description="
TBA
">
+ <action issue="NET-430" dev="sebb" type="fix">
+ Can't login to POP3S Server using explicit mode
+ </action>
<action issue="NET-434" dev="sebb" type="fix">
FTPClient fails to close local listener socket when command socket
channel encounter "ReadTimeoutException"
</action>
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3.java?rev=1227768&r1=1227767&r2=1227768&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3.java
Thu Jan 5 19:07:55 2012
@@ -76,10 +76,10 @@ public class POP3 extends SocketClient
// We have to ensure that the protocol communication is in ASCII
// but we use ISO-8859-1 just in case 8-bit characters cross
// the wire.
- private static final String __DEFAULT_ENCODING = "ISO-8859-1";
+ static final String _DEFAULT_ENCODING = "ISO-8859-1";
private int __popState;
- private BufferedWriter __writer;
+ BufferedWriter _writer;
BufferedReader _reader;
int _replyCode;
@@ -101,7 +101,7 @@ public class POP3 extends SocketClient
setDefaultPort(DEFAULT_PORT);
__popState = DISCONNECTED_STATE;
_reader = null;
- __writer = null;
+ _writer = null;
_replyLines = new ArrayList<String>();
_commandSupport_ = new ProtocolCommandSupport(this);
}
@@ -144,10 +144,10 @@ public class POP3 extends SocketClient
super._connectAction_();
_reader =
new CRLFLineReader(new InputStreamReader(_input_,
- __DEFAULT_ENCODING));
- __writer =
+ _DEFAULT_ENCODING));
+ _writer =
new BufferedWriter(new OutputStreamWriter(_output_,
- __DEFAULT_ENCODING));
+ _DEFAULT_ENCODING));
__getReply();
setState(AUTHORIZATION_STATE);
}
@@ -205,7 +205,7 @@ public class POP3 extends SocketClient
{
super.disconnect();
_reader = null;
- __writer = null;
+ _writer = null;
_lastReplyLine = null;
_replyLines.clear();
setState(DISCONNECTED_STATE);
@@ -221,7 +221,7 @@ public class POP3 extends SocketClient
***/
public int sendCommand(String command, String args) throws IOException
{
- if (__writer == null) {
+ if (_writer == null) {
throw new IllegalStateException("Socket is not connected");
}
StringBuilder __commandBuffer = new StringBuilder();
@@ -235,8 +235,8 @@ public class POP3 extends SocketClient
__commandBuffer.append(SocketClient.NETASCII_EOL);
String message = __commandBuffer.toString();
- __writer.write(message);
- __writer.flush();
+ _writer.write(message);
+ _writer.flush();
fireCommandSent(command, message);
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3SClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3SClient.java?rev=1227768&r1=1227767&r2=1227768&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3SClient.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3SClient.java
Thu Jan 5 19:07:55 2012
@@ -17,7 +17,10 @@
package org.apache.commons.net.pop3;
+import java.io.BufferedWriter;
import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
import java.net.Socket;
import javax.net.ssl.KeyManager;
@@ -27,6 +30,7 @@ import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
+import org.apache.commons.net.io.CRLFLineReader;
import org.apache.commons.net.util.SSLContextUtils;
/**
@@ -203,6 +207,8 @@ public class POP3SClient extends POP3Cli
_socket_ = socket;
_input_ = socket.getInputStream();
_output_ = socket.getOutputStream();
+ _reader = new CRLFLineReader(new InputStreamReader(_input_,
_DEFAULT_ENCODING));
+ _writer = new BufferedWriter(new OutputStreamWriter(_output_,
_DEFAULT_ENCODING));
}
/**
