On 5 July 2012 09:56, <[email protected]> wrote: > 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
Presumably IO 2.2 was chosen because it only requires Java 1.5? > 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> > > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
