Author: sebb
Date: Fri Mar 11 18:41:20 2011
New Revision: 1080721
URL: http://svn.apache.org/viewvc?rev=1080721&view=rev
Log:
Case conversion needs Locale
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java?rev=1080721&r1=1080720&r2=1080721&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Fri Mar 11 18:41:20 2011
@@ -32,6 +32,7 @@ import java.net.SocketException;
import java.net.SocketTimeoutException;
import java.net.UnknownHostException;
import java.util.ArrayList;
+import java.util.Locale;
import java.util.Properties;
import java.util.Random;
@@ -737,8 +738,8 @@ implements Configurable
{
for ( int i = 0; i < features.length; i++ )
{
- if ( features[i].trim().toUpperCase().equals("UTF8")
- ||
features[i].trim().toUpperCase().equals("UTF-8") )
+ if (
features[i].trim().toUpperCase(Locale.ENGLISH).equals("UTF8")
+ ||
features[i].trim().toUpperCase(Locale.ENGLISH).equals("UTF-8") )
{
setControlEncoding("UTF-8");
_controlInput_ =