bwalding 2003/10/17 07:15:01
Modified:
src/plugins-build/linkcheck/src/main/org/apache/maven/linkcheck/validation
HTTPLinkValidator.java
Added:
src/plugins-build/linkcheck/src/test/org/apache/maven/linkcheck/validation
HTTPLinkValidatorTest.java
Log:
Now checks the StatusLine object which will be null if the validation failed badly.
This prevents an unexpected NPE when checking the status code.
PR: MAVEN-943
Revision Changes Path
1.1
maven/src/plugins-build/linkcheck/src/test/org/apache/maven/linkcheck/validation/HTTPLinkValidatorTest.java
Index: HTTPLinkValidatorTest.java
===================================================================
package org.apache.maven.linkcheck.validation;
import java.io.File;
import junit.framework.TestCase;
/**
* @author <a href="[EMAIL PROTECTED]">Ben Walding</a>
* @version $Id: HTTPLinkValidatorTest.java,v 1.1 2003/10/17 14:15:01 bwalding Exp $
*/
public class HTTPLinkValidatorTest extends TestCase
{
public void testValidateLink()
{
//I've disabled these as they require access to the net. Ultimately
//I'd like to setup a temporary internal webserver during testing.
//Probably a test repository so it can be used for a variety of things.
//checkLink("http://www.example.com";);
//checkLink("http://www.example.com>);");
}
protected LinkValidationResult checkLink(String link)
{
HTTPLinkValidator hlv = new HTTPLinkValidator(null, null, null, null);
LinkValidationItem lvi = new LinkValidationItem(new File("."), link);
return hlv.validateLink(lvi);
}
}
1.9 +8 -1
maven/src/plugins-build/linkcheck/src/main/org/apache/maven/linkcheck/validation/HTTPLinkValidator.java
Index: HTTPLinkValidator.java
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/linkcheck/src/main/org/apache/maven/linkcheck/validation/HTTPLinkValidator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- HTTPLinkValidator.java 13 Sep 2003 21:48:08 -0000 1.8
+++ HTTPLinkValidator.java 17 Oct 2003 14:15:01 -0000 1.9
@@ -60,6 +60,7 @@
import org.apache.commons.httpclient.HostConfiguration;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpState;
+import org.apache.commons.httpclient.StatusLine;
import org.apache.commons.httpclient.UsernamePasswordCredentials;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.logging.Log;
@@ -135,6 +136,12 @@
// execute the GET
GetMethod gm = checkLink(cl, link);
+ StatusLine sl = gm.getStatusLine();
+
+ if (sl == null) {
+ LOG.info("Unknown error validating link : " + link);
+ return LVR_VALID;
+ }
if (gm.getStatusCode() == 302)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
