Revision: 4378
http://openutils.svn.sourceforge.net/openutils/?rev=4378&view=rev
Author: fgiust
Date: 2013-10-14 08:14:15 +0000 (Mon, 14 Oct 2013)
Log Message:
-----------
check for broken nodes while iterating
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2013-10-13 20:39:28 UTC (rev 4377)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2013-10-14 08:14:15 UTC (rev 4378)
@@ -80,22 +80,26 @@
do
{
next = super.next();
- try
+ if (next != null) // may happen for broken indexes?
{
- if (!PermissionUtil.isGranted(
- next.getSession().getWorkspace().getName(),
- NodeUtil.getPathIfPossible(next),
- Session.ACTION_READ))
+ try
{
- next = null;
+ if (!PermissionUtil.isGranted(
+ next.getSession().getWorkspace().getName(),
+ NodeUtil.getPathIfPossible(next),
+ Session.ACTION_READ))
+ {
+ next = null;
+ }
}
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
}
- catch (RepositoryException e)
- {
- throw new RuntimeRepositoryException(e);
- }
}
while (next == null && super.hasNext());
+
// return true if a next result exists and it is accessible
return next != null;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|