You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2014/10/26 12:49:37 UTC
svn commit: r1634307 - in /sling/trunk/bundles/extensions/event/src:
main/java/org/apache/sling/event/impl/jobs/JobTopicTraverser.java
test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Author: cziegeler
Date: Sun Oct 26 11:49:36 2014
New Revision: 1634307
URL: http://svn.apache.org/r1634307
Log:
Use latest jcr resource release and remove workaround
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobTopicTraverser.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobTopicTraverser.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobTopicTraverser.java?rev=1634307&r1=1634306&r2=1634307&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobTopicTraverser.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobTopicTraverser.java Sun Oct 26 11:49:36 2014
@@ -143,30 +143,19 @@ public class JobTopicTraverser {
final List<JobImpl> jobs = new ArrayList<JobImpl>();
// we use an iterator to skip removed entries
// see SLING-4073
- Iterator<Resource> jobIter = null;
- do {
- try {
- jobIter = minuteResource.listChildren();
- } catch ( final IllegalStateException ise) {
- // ignore
- }
- } while ( jobIter == null );
+ final Iterator<Resource> jobIter = minuteResource.listChildren();
while ( jobIter.hasNext() ) {
- try {
- final Resource jobResource = jobIter.next();
- if ( resourceHandler != null ) {
- if ( !resourceHandler.handle(jobResource) ) {
- return;
- }
- } else {
- final JobImpl job = Utility.readJob(logger, jobResource);
- if ( job != null ) {
- logger.debug("Found job {}", jobResource.getName());
- jobs.add(job);
- }
+ final Resource jobResource = jobIter.next();
+ if ( resourceHandler != null ) {
+ if ( !resourceHandler.handle(jobResource) ) {
+ return;
+ }
+ } else {
+ final JobImpl job = Utility.readJob(logger, jobResource);
+ if ( job != null ) {
+ logger.debug("Found job {}", jobResource.getName());
+ jobs.add(job);
}
- } catch ( final IllegalStateException ise) {
- // ignore
}
}
Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java?rev=1634307&r1=1634306&r2=1634307&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java (original)
+++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java Sun Oct 26 11:49:36 2014
@@ -138,7 +138,7 @@ public abstract class AbstractJobHandlin
mavenBundle("org.apache.sling", "org.apache.sling.settings", "1.3.4"),
mavenBundle("org.apache.sling", "org.apache.sling.resourceresolver", "1.1.6"),
mavenBundle("org.apache.sling", "org.apache.sling.adapter", "2.1.2"),
- mavenBundle("org.apache.sling", "org.apache.sling.jcr.resource", "2.3.10"),
+ mavenBundle("org.apache.sling", "org.apache.sling.jcr.resource", "2.3.12"),
mavenBundle("org.apache.sling", "org.apache.sling.jcr.classloader", "3.2.2"),
mavenBundle("org.apache.sling", "org.apache.sling.jcr.contentloader", "2.1.8"),
mavenBundle("org.apache.sling", "org.apache.sling.engine", "2.3.6"),