From: <wol...@us...> - 2012-01-26 17:19:50
|
Revision: 15738 http://exist.svn.sourceforge.net/exist/?rev=15738&view=rev Author: wolfgang_m Date: 2012-01-26 17:19:44 +0000 (Thu, 26 Jan 2012) Log Message: ----------- [ignore] Fixed NPE in consistency checker; changed log priority to info. Modified Paths: -------------- trunk/eXist/src/org/exist/backup/ConsistencyCheck.java trunk/eXist/src/org/exist/storage/ConsistencyCheckTask.java Modified: trunk/eXist/src/org/exist/backup/ConsistencyCheck.java =================================================================== --- trunk/eXist/src/org/exist/backup/ConsistencyCheck.java 2012-01-26 14:49:57 UTC (rev 15737) +++ trunk/eXist/src/org/exist/backup/ConsistencyCheck.java 2012-01-26 17:19:44 UTC (rev 15738) @@ -118,7 +118,8 @@ private void checkCollection( Collection collection, List<ErrorReport> errors, ProgressCallback callback ) throws TerminatedException { XmldbURI uri = collection.getURI(); - callback.startCollection( uri.toString() ); + if (callback != null) + callback.startCollection( uri.toString() ); for( Iterator<XmldbURI> i = collection.collectionIteratorNoLock(); i.hasNext(); ) { XmldbURI childUri = i.next(); @@ -131,7 +132,8 @@ error.setCollectionId( collection.getId() ); error.setCollectionURI( childUri ); errors.add( error ); - callback.error( error ); + if (callback != null) + callback.error( error ); continue; } if (child.getId() != collection.getId()) @@ -142,7 +144,8 @@ error.setCollectionId( collection.getId() ); error.setCollectionURI( childUri ); errors.add( error ); - callback.error( error ); + if (callback != null) + callback.error( error ); } } } Modified: trunk/eXist/src/org/exist/storage/ConsistencyCheckTask.java =================================================================== --- trunk/eXist/src/org/exist/storage/ConsistencyCheckTask.java 2012-01-26 14:49:57 UTC (rev 15737) +++ trunk/eXist/src/org/exist/storage/ConsistencyCheckTask.java 2012-01-26 17:19:44 UTC (rev 15738) @@ -110,8 +110,8 @@ agentInstance.changeStatus(brokerPool, new TaskStatus(TaskStatus.Status.INIT)); if (paused) { - if (LOG.isDebugEnabled()) - LOG.debug("Consistency check is paused."); + if (LOG.isInfoEnabled()) + LOG.info("Consistency check is paused."); agentInstance.changeStatus(brokerPool, new TaskStatus(TaskStatus.Status.PAUSED)); return; } @@ -153,16 +153,16 @@ } if (doBackup) { - if (LOG.isDebugEnabled()) { - LOG.debug("Starting backup..."); + if (LOG.isInfoEnabled()) { + LOG.info("Starting backup..."); } SystemExport sysexport = new SystemExport(broker, logCallback, monitor, false); lastExportedBackup = sysexport.export(exportDir, incremental, maxInc, createZip, errors); agentInstance.changeStatus(brokerPool, new TaskStatus(TaskStatus.Status.RUNNING_BACKUP)); - if (LOG.isDebugEnabled() && lastExportedBackup != null) { - LOG.debug("Created backup to file: " + lastExportedBackup.getAbsolutePath()); + if (LOG.isInfoEnabled() && lastExportedBackup != null) { + LOG.info("Created backup to file: " + lastExportedBackup.getAbsolutePath()); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |