Author: cziegeler
Date: Tue Dec 15 10:29:51 2009
New Revision: 890745
URL: http://svn.apache.org/viewvc?rev=890745&view=rev
Log:
SLING-1238 : Counter for maximum parallel threads is not handled correctly
Modified:
sling/trunk/bundles/extensions/event/pom.xml
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java
Modified: sling/trunk/bundles/extensions/event/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/pom.xml?rev=890745&r1=890744&r2=890745&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/pom.xml (original)
+++ sling/trunk/bundles/extensions/event/pom.xml Tue Dec 15 10:29:51 2009
@@ -55,7 +55,7 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.sling.event;version=2.0.6
+ org.apache.sling.event;version=2.0.8
</Export-Package>
<Private-Package>
org.apache.sling.event.impl,
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java?rev=890745&r1=890744&r2=890745&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java
(original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java
Tue Dec 15 10:29:51 2009
@@ -905,7 +905,7 @@
final String jobTopic = (String)event.getProperty(EventUtil.PROPERTY_JOB_TOPIC);
boolean unlock = true;
try {
- if ( isMainQueue && !parallelProcessing ) {
+ if ( isMainQueue && parallelProcessing ) {
this.parallelJobCount++;
}
final String nodePath = eventNode.getPath();
@@ -934,7 +934,7 @@
this.logger.error("Exception during job processing.", re);
} finally {
if ( unlock ) {
- if ( isMainQueue && !parallelProcessing ) {
+ if ( isMainQueue && parallelProcessing ) {
this.parallelJobCount--;
}
if ( !parallelProcessing ) {
|