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 2008/02/11 18:41:25 UTC
svn commit: r620537 -
/incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java
Author: cziegeler
Date: Mon Feb 11 09:41:19 2008
New Revision: 620537
URL: http://svn.apache.org/viewvc?rev=620537&view=rev
Log:
Fix lock token handling.
Modified:
incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java
Modified: incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java?rev=620537&r1=620536&r2=620537&view=diff
==============================================================================
--- incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java (original)
+++ incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java Mon Feb 11 09:41:19 2008
@@ -96,6 +96,12 @@
protected void deactivate(final ComponentContext context) {
super.deactivate(context);
if ( this.backgroundSession != null ) {
+ try {
+ this.backgroundSession.getWorkspace().getObservationManager().removeEventListener(this);
+ } catch (RepositoryException e) {
+ // we just ignore it
+ this.logger.warn("Unable to remove event listener.", e);
+ }
this.backgroundSession.logout();
this.backgroundSession = null;
}
@@ -312,7 +318,7 @@
super.startWriterSession();
// load unprocessed jobs from repository
this.loadJobs();
- this.writerSession.getWorkspace().getObservationManager()
+ this.backgroundSession.getWorkspace().getObservationManager()
.addEventListener(this,
javax.jcr.observation.Event.PROPERTY_CHANGED | javax.jcr.observation.Event.PROPERTY_REMOVED,
this.repositoryPath,