Author: scohen Date: Sat Dec 3 05:34:01 2005 New Revision: 351942 URL: http://svn.apache.org/viewcvs?rev=351942&view=rev Log: Apply patch from Andrea Rombald to restore JDK 1.3 compatibility.
Modified: jakarta/commons/proper/net/branches/NET_1_4_1/src/java/org/apache/commons/net/ftp/FTPClientConfig.java jakarta/commons/proper/net/branches/NET_1_4_1/src/java/org/apache/commons/net/nntp/Article.java Modified: jakarta/commons/proper/net/branches/NET_1_4_1/src/java/org/apache/commons/net/ftp/FTPClientConfig.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/net/branches/NET_1_4_1/src/java/org/apache/commons/net/ftp/FTPClientConfig.java?rev=351942&r1=351941&r2=351942&view=diff ============================================================================== --- jakarta/commons/proper/net/branches/NET_1_4_1/src/java/org/apache/commons/net/ftp/FTPClientConfig.java (original) +++ jakarta/commons/proper/net/branches/NET_1_4_1/src/java/org/apache/commons/net/ftp/FTPClientConfig.java Sat Dec 3 05:34:01 2005 @@ -245,17 +245,17 @@ LANGUAGE_CODE_MAP.put("en", Locale.ENGLISH); LANGUAGE_CODE_MAP.put("de",Locale.GERMAN); LANGUAGE_CODE_MAP.put("it",Locale.ITALIAN); - LANGUAGE_CODE_MAP.put("es", new Locale("es")); // spanish - LANGUAGE_CODE_MAP.put("pt", new Locale("pt")); // portuguese - LANGUAGE_CODE_MAP.put("da", new Locale("da")); // danish - LANGUAGE_CODE_MAP.put("sv", new Locale("sv")); // swedish - LANGUAGE_CODE_MAP.put("no", new Locale("no")); // norwegian - LANGUAGE_CODE_MAP.put("nl", new Locale("nl")); // dutch - LANGUAGE_CODE_MAP.put("ro", new Locale("ro")); // romanian - LANGUAGE_CODE_MAP.put("sq", new Locale("sq")); // albanian - LANGUAGE_CODE_MAP.put("sh", new Locale("sh")); // serbo-croatian - LANGUAGE_CODE_MAP.put("sk", new Locale("sk")); // slovak - LANGUAGE_CODE_MAP.put("sl", new Locale("sl")); // slovenian + LANGUAGE_CODE_MAP.put("es", new Locale("es", "", "")); // spanish + LANGUAGE_CODE_MAP.put("pt", new Locale("pt", "", "")); // portuguese + LANGUAGE_CODE_MAP.put("da", new Locale("da", "", "")); // danish + LANGUAGE_CODE_MAP.put("sv", new Locale("sv", "", "")); // swedish + LANGUAGE_CODE_MAP.put("no", new Locale("no", "", "")); // norwegian + LANGUAGE_CODE_MAP.put("nl", new Locale("nl", "", "")); // dutch + LANGUAGE_CODE_MAP.put("ro", new Locale("ro", "", "")); // romanian + LANGUAGE_CODE_MAP.put("sq", new Locale("sq", "", "")); // albanian + LANGUAGE_CODE_MAP.put("sh", new Locale("sh", "", "")); // serbo-croatian + LANGUAGE_CODE_MAP.put("sk", new Locale("sk", "", "")); // slovak + LANGUAGE_CODE_MAP.put("sl", new Locale("sl", "", "")); // slovenian // some don't Modified: jakarta/commons/proper/net/branches/NET_1_4_1/src/java/org/apache/commons/net/nntp/Article.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/net/branches/NET_1_4_1/src/java/org/apache/commons/net/nntp/Article.java?rev=351942&r1=351941&r2=351942&view=diff ============================================================================== --- jakarta/commons/proper/net/branches/NET_1_4_1/src/java/org/apache/commons/net/nntp/Article.java (original) +++ jakarta/commons/proper/net/branches/NET_1_4_1/src/java/org/apache/commons/net/nntp/Article.java Sat Dec 3 05:34:01 2005 @@ -113,7 +113,7 @@ if (references == null) return new String[0]; ArrayList list = new ArrayList(); - int terminator = references.indexOf(":"); + int terminator = references.toString().indexOf(':'); StringTokenizer st = new StringTokenizer(references.substring(terminator), "\t"); while (st.hasMoreTokens()) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]