You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by vs...@apache.org on 2009/08/02 12:59:27 UTC
svn commit: r800025 -
/maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/validation/OnlineHTTPLinkValidator.java
Author: vsiveton
Date: Sun Aug 2 10:59:27 2009
New Revision: 800025
URL: http://svn.apache.org/viewvc?rev=800025&view=rev
Log:
o revert part of r799837 to respect r709693 about logging performance
Modified:
maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/validation/OnlineHTTPLinkValidator.java
Modified: maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/validation/OnlineHTTPLinkValidator.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/validation/OnlineHTTPLinkValidator.java?rev=800025&r1=800024&r2=800025&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/validation/OnlineHTTPLinkValidator.java (original)
+++ maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/validation/OnlineHTTPLinkValidator.java Sun Aug 2 10:59:27 2009
@@ -101,7 +101,10 @@
bean = new HttpBean();
}
- LOG.debug( "Will use method : [" + bean.getMethod() + "]" );
+ if ( LOG.isDebugEnabled() )
+ {
+ LOG.debug( "Will use method : [" + bean.getMethod() + "]" );
+ }
this.http = bean;
@@ -159,8 +162,11 @@
{
if ( getBaseURL() == null )
{
- LOG.warn( "Cannot check link [" + link + "] in page [" + lvi.getSource()
- + "], as no base URL has been set!" );
+ if ( LOG.isWarnEnabled() )
+ {
+ LOG.warn( "Cannot check link [" + link + "] in page [" + lvi.getSource()
+ + "], as no base URL has been set!" );
+ }
return new LinkValidationResult( LinkcheckFileResult.WARNING_LEVEL, false,
"No base URL specified" );
@@ -176,7 +182,10 @@
}
catch ( Throwable t )
{
- LOG.debug( "Received: [" + t + "] for [" + link + "] in page [" + lvi.getSource() + "]", t );
+ if ( LOG.isDebugEnabled() )
+ {
+ LOG.debug( "Received: [" + t + "] for [" + link + "] in page [" + lvi.getSource() + "]", t );
+ }
return new LinkValidationResult( LinkcheckFileResult.ERROR_LEVEL, false, t.getClass().getName()
+ " : " + t.getMessage() );
@@ -267,12 +276,18 @@
{
hc.setProxy( this.http.getProxyHost(), this.http.getProxyPort() );
- LOG.debug( "Proxy Host:" + this.http.getProxyHost() );
- LOG.debug( "Proxy Port:" + this.http.getProxyPort() );
+ if ( LOG.isDebugEnabled() )
+ {
+ LOG.debug( "Proxy Host:" + this.http.getProxyHost() );
+ LOG.debug( "Proxy Port:" + this.http.getProxyPort() );
+ }
if ( StringUtils.isNotEmpty( this.http.getProxyUser() ) && this.http.getProxyPassword() != null )
{
- LOG.debug( "Proxy User:" + this.http.getProxyUser() );
+ if ( LOG.isDebugEnabled() )
+ {
+ LOG.debug( "Proxy User:" + this.http.getProxyUser() );
+ }
Credentials credentials;
if ( StringUtils.isNotEmpty( this.http.getProxyNtlmHost() ) )
@@ -325,8 +340,11 @@
}
catch ( NumberFormatException e )
{
- LOG.warn( "HttpClient parameter '" + HttpClientParams.MAX_REDIRECTS
- + "' is not a number. Ignoring" );
+ if ( LOG.isWarnEnabled() )
+ {
+ LOG.warn( "HttpClient parameter '" + HttpClientParams.MAX_REDIRECTS
+ + "' is not a number. Ignoring!" );
+ }
}
}
if ( nbRedirect > max )
@@ -345,7 +363,10 @@
}
else
{
- LOG.error( "Unsupported method: " + this.http.getMethod() + ", using 'get'." );
+ if ( LOG.isErrorEnabled() )
+ {
+ LOG.error( "Unsupported method: " + this.http.getMethod() + ", using 'get'." );
+ }
hm = new GetMethod( link );
}
@@ -363,7 +384,10 @@
StatusLine sl = hm.getStatusLine();
if ( sl == null )
{
- LOG.error( "Unknown error validating link : " + link );
+ if ( LOG.isErrorEnabled() )
+ {
+ LOG.error( "Unknown error validating link : " + link );
+ }
return null;
}
@@ -402,7 +426,10 @@
HttpMethod oldHm = hm;
- LOG.debug( "[" + link + "] is redirected to [" + newLink + "]" );
+ if ( LOG.isDebugEnabled() )
+ {
+ LOG.debug( "[" + link + "] is redirected to [" + newLink + "]" );
+ }
oldHm.releaseConnection();