Return-Path: 
 <commits-return-5184-apmail-hc-commits-archive=hc.apache.org@hc.apache.org>
X-Original-To: apmail-hc-commits-archive@www.apache.org
Delivered-To: apmail-hc-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id D0752D2FE
	for <apmail-hc-commits-archive@www.apache.org>;
 Thu,  5 Jul 2012 08:57:23 +0000 (UTC)
Received: (qmail 81349 invoked by uid 500); 5 Jul 2012 08:57:23 -0000
Delivered-To: apmail-hc-commits-archive@hc.apache.org
Received: (qmail 81287 invoked by uid 500); 5 Jul 2012 08:57:22 -0000
Mailing-List: contact commits-help@hc.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hc.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hc.apache.org>
List-Post: <mailto:commits@hc.apache.org>
List-Id: <commits.hc.apache.org>
Reply-To: "HttpComponents Project" <dev@hc.apache.org>
Delivered-To: mailing list commits@hc.apache.org
Received: (qmail 81267 invoked by uid 99); 5 Jul 2012 08:57:22 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jul 2012 08:57:22 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jul 2012 08:57:19 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id C8B0623888CD
	for <commits@hc.apache.org>; Thu,  5 Jul 2012 08:56:58 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1357500 - in /httpcomponents/httpasyncclient/trunk:
 httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestZeroCopy.java
 pom.xml
Date: Thu, 05 Jul 2012 08:56:58 -0000
To: commits@hc.apache.org
From: olegk@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120705085658.C8B0623888CD@eris.apache.org>

Author: olegk
Date: Thu Jul  5 08:56:58 2012
New Revision: 1357500

URL: http://svn.apache.org/viewvc?rev=1357500&view=rev
Log:
Upgraded HttpCore to version 4.2.1; upgraded HttpClient to version 4.2.1; downgraded Commons IO to version 2.2

Modified:
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestZeroCopy.java
    httpcomponents/httpasyncclient/trunk/pom.xml

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestZeroCopy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestZeroCopy.java?rev=1357500&r1=1357499&r2=1357500&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestZeroCopy.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestZeroCopy.java Thu Jul  5 08:56:58 2012
@@ -39,6 +39,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
 import org.apache.commons.io.output.FileWriterWithEncoding;
+import org.apache.http.Consts;
 import org.apache.http.HttpAsyncTestBase;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpEntityEnclosingRequest;
@@ -231,7 +232,11 @@ public class TestZeroCopy extends HttpAs
             InputStream instream = requestEntity.getContent();
             try {
                 ContentType contentType = ContentType.getOrDefault(requestEntity);
-                LineIterator it = IOUtils.lineIterator(instream, contentType.getCharset());
+                Charset charset = contentType.getCharset();
+                if (charset == null) {
+                    charset = Consts.ISO_8859_1;
+                }
+                LineIterator it = IOUtils.lineIterator(instream, charset.name());
                 int count = 0;
                 while (it.hasNext()) {
                     String line = it.next();

Modified: httpcomponents/httpasyncclient/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/pom.xml?rev=1357500&r1=1357499&r2=1357500&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/pom.xml (original)
+++ httpcomponents/httpasyncclient/trunk/pom.xml Thu Jul  5 08:56:58 2012
@@ -28,7 +28,7 @@
   <parent>
     <artifactId>project</artifactId>
     <groupId>org.apache.httpcomponents</groupId>
-    <version>5</version>
+    <version>6</version>
     <relativePath>../project/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -71,10 +71,10 @@
     <maven.compile.target>1.5</maven.compile.target>
     <maven.compile.optimize>true</maven.compile.optimize>
     <maven.compile.deprecation>true</maven.compile.deprecation>
-    <httpcore.version>4.2</httpcore.version>
-    <httpclient.version>4.2-beta1</httpclient.version>
+    <httpcore.version>4.2.1</httpcore.version>
+    <httpclient.version>4.2.1</httpclient.version>
     <commons-logging.version>1.1.1</commons-logging.version>
-    <commons-io.version>2.3</commons-io.version>
+    <commons-io.version>2.2</commons-io.version>
     <junit.version>4.8.1</junit.version>
     <mockito.version>1.8.5</mockito.version>
   </properties>