Skip to content

Commit 2994716

Browse files
sutrasutra
committed
Merge branch 'hotfix/0.10.1'
2 parents 65fd8f3 + 78740a4 commit 2994716

File tree

9 files changed

+14
-12
lines changed

9 files changed

+14
-12
lines changed

‎pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<groupId>us.codecraft</groupId>
4-
<version>0.10.0</version>
4+
<version>0.10.1</version>
55
<modelVersion>4.0.0</modelVersion>
66
<packaging>pom</packaging>
77
<properties>
@@ -30,7 +30,7 @@
3030
<moco.version>1.3.0</moco.version>
3131
<phantomjsdriver.version>1.2.0</phantomjsdriver.version>
3232
<saxon-he.version>11.4</saxon-he.version>
33-
<selenium-java.version>4.14.1</selenium-java.version>
33+
<selenium-java.version>3.141.59</selenium-java.version>
3434
<slf4j.version>2.0.4</slf4j.version>
3535
<spring-version>4.0.0.RELEASE</spring-version>
3636
<xsoup.version>0.3.5</xsoup.version>

‎webmagic-core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>us.codecraft</groupId>
55
<artifactId>webmagic-parent</artifactId>
6-
<version>0.10.0</version>
6+
<version>0.10.1</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientDownloader.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.util.Optional;
88

99
import org.apache.commons.io.IOUtils;
10+
import org.apache.http.HttpEntity;
1011
import org.apache.http.HttpResponse;
1112
import org.apache.http.client.methods.CloseableHttpResponse;
1213
import org.apache.http.impl.client.CloseableHttpClient;
@@ -85,13 +86,13 @@ public Page download(Request request, Task task) {
8586
page = handleResponse(request, request.getCharset() != null ? request.getCharset() : task.getSite().getCharset(), httpResponse, task);
8687

8788
onSuccess(page, task);
88-
logger.info("downloading page success {}", request.getUrl());
89+
logger.info("Download page success: {}", request.getUrl());
8990

9091
return page;
9192
} catch (IOException e) {
9293

9394
onError(page, task, e);
94-
logger.info("download page {} error", request.getUrl(), e);
95+
logger.info("Download page error: {}", request.getUrl(), e);
9596

9697
return page;
9798
} finally {
@@ -111,7 +112,8 @@ public void setThread(int thread) {
111112
}
112113

113114
protected Page handleResponse(Request request, String charset, HttpResponse httpResponse, Task task) throws IOException {
114-
byte[] bytes = IOUtils.toByteArray(httpResponse.getEntity().getContent());
115+
HttpEntity entity = httpResponse.getEntity();
116+
byte[] bytes = entity != null ? IOUtils.toByteArray(entity.getContent()) : new byte[0];;
115117
String contentType = httpResponse.getEntity().getContentType() == null ? "" : httpResponse.getEntity().getContentType().getValue();
116118
Page page = new Page();
117119
page.setBytes(bytes);

‎webmagic-coverage/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>us.codecraft</groupId>
1010
<artifactId>webmagic-parent</artifactId>
11-
<version>0.10.0</version>
11+
<version>0.10.1</version>
1212
</parent>
1313

1414
<artifactId>webmagic-coverage</artifactId>

‎webmagic-extension/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>us.codecraft</groupId>
55
<artifactId>webmagic-parent</artifactId>
6-
<version>0.10.0</version>
6+
<version>0.10.1</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎webmagic-samples/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>webmagic-parent</artifactId>
55
<groupId>us.codecraft</groupId>
6-
<version>0.10.0</version>
6+
<version>0.10.1</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎webmagic-saxon/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>webmagic-parent</artifactId>
55
<groupId>us.codecraft</groupId>
6-
<version>0.10.0</version>
6+
<version>0.10.1</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎webmagic-scripts/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>webmagic-parent</artifactId>
55
<groupId>us.codecraft</groupId>
6-
<version>0.10.0</version>
6+
<version>0.10.1</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎webmagic-selenium/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>webmagic-parent</artifactId>
55
<groupId>us.codecraft</groupId>
6-
<version>0.10.0</version>
6+
<version>0.10.1</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

0 commit comments

Comments
 (0)