You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2007/08/26 09:19:50 UTC
svn commit: r569774 -
/maven/sandbox/trunk/doxia/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/validation/LinkValidatorManager.java
Author: ltheussl
Date: Sun Aug 26 00:19:50 2007
New Revision: 569774
URL: http://svn.apache.org/viewvc?rev=569774&view=rev
Log:
Avoid NPE when no cache file is specified. Add some logs.
Modified:
maven/sandbox/trunk/doxia/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/validation/LinkValidatorManager.java
Modified: maven/sandbox/trunk/doxia/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/validation/LinkValidatorManager.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/validation/LinkValidatorManager.java?rev=569774&r1=569773&r2=569774&view=diff
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/validation/LinkValidatorManager.java (original)
+++ maven/sandbox/trunk/doxia/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/validation/LinkValidatorManager.java Sun Aug 26 00:19:50 2007
@@ -108,13 +108,11 @@
*/
public LinkValidationResult validateLink( LinkValidationItem lvi ) throws Exception
{
- {
- LinkValidationResult cachedResult = getCachedResult( lvi );
+ LinkValidationResult cachedResult = getCachedResult( lvi );
- if ( cachedResult != null )
- {
- return cachedResult;
- }
+ if ( cachedResult != null )
+ {
+ return cachedResult;
}
for ( int i = 0; i < this.excludes.length; i++ )
@@ -179,9 +177,16 @@
* Loads a cache file.
*
* @param cacheFilename The name of the cache file.
+ * May be null, in which case the request is ignored.
*/
public void loadCache( String cacheFilename )
{
+ if ( cacheFilename == null )
+ {
+ LOG.debug( "No cache file specified! Ignoring request to load." );
+ return;
+ }
+
try
{
File f = new File( cacheFilename );
@@ -193,6 +198,11 @@
this.cache = (Map) is.readObject();
is.close();
+
+ if ( LOG.isDebugEnabled() )
+ {
+ LOG.debug( "Cache file loaded: " + cacheFilename );
+ }
}
}
catch ( InvalidClassException e )
@@ -209,9 +219,16 @@
* Saves a cache file.
*
* @param cacheFilename The name of the cache file.
+ * May be null, in which case the request is ignored.
*/
public void saveCache( String cacheFilename )
{
+ if ( cacheFilename == null )
+ {
+ LOG.warn( "No cache file specified! Ignoring request to store results." );
+ return;
+ }
+
try
{
// Remove non-persistent items from cache