Mobai
/
magic-Dependency
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#27 nullpointer fix

master
yihua.huang 2013-10-11 11:32:44 +08:00
parent 16e12e3bc9
commit 5a226387e0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientPool.java
View File

@ -51,9 +51,14 @@ public class HttpClientPool {
HttpParams params = new BasicHttpParams(); HttpParams params = new BasicHttpParams();
if (site != null && site.getUserAgent() != null) { if (site != null && site.getUserAgent() != null) {
params.setParameter(CoreProtocolPNames.USER_AGENT, site.getUserAgent()); params.setParameter(CoreProtocolPNames.USER_AGENT, site.getUserAgent());
}
params.setIntParameter(CoreConnectionPNames.SO_TIMEOUT, site.getTimeOut()); params.setIntParameter(CoreConnectionPNames.SO_TIMEOUT, site.getTimeOut());
params.setIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, site.getTimeOut()); params.setIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, site.getTimeOut());
} else {
params.setIntParameter(CoreConnectionPNames.SO_TIMEOUT, 3000);
params.setIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 3000);
}
params.setParameter(ClientPNames.COOKIE_POLICY, CookiePolicy.BEST_MATCH); params.setParameter(ClientPNames.COOKIE_POLICY, CookiePolicy.BEST_MATCH);
HttpProtocolParamBean paramsBean = new HttpProtocolParamBean(params); HttpProtocolParamBean paramsBean = new HttpProtocolParamBean(params);
paramsBean.setVersion(HttpVersion.HTTP_1_1); paramsBean.setVersion(HttpVersion.HTTP_1_1);
@ -73,7 +78,6 @@ public class HttpClientPool {
if (site != null) { if (site != null) {
generateCookie(httpClient, site); generateCookie(httpClient, site);
} }
return httpClient; return httpClient;
} }

1
webmagic-core/src/test/java/us/codecraft/webmagic/downloader/HttpClientDownloaderTest.java
View File

@ -22,4 +22,5 @@ public class HttpClientDownloaderTest {
Page download = httpClientDownloader.download(new Request("http://www.diandian.com"), site.toTask()); Page download = httpClientDownloader.download(new Request("http://www.diandian.com"), site.toTask());
Assert.assertTrue(download.getHtml().toString().contains("flashsword30")); Assert.assertTrue(download.getHtml().toString().contains("flashsword30"));
} }
} }