svn commit: r1481860 - in /sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs: JobImpl.java JobManagerImpl.java TopologyCapabilities.java

[cz...@apache.org]

Author: cziegeler
Date: Mon May 13 14:15:10 2013
New Revision: 1481860

URL: http://svn.apache.org/r1481860
Log:
SLING-2867 Improve implementation : Change some log messages to info for easier debugging, Fix reassign jobs handling when job has been sent via event admin

Modified:
    sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobImpl.java
    sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java
    sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/TopologyCapabilities.java

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobImpl.java?rev=1481860&r1=1481859&r2=1481860&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobImpl.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobImpl.java Mon May 13 14:15:10 2013
@@ -73,7 +73,7 @@ public class JobImpl implements Job {
         this.name = name;
         this.jobId = jobId;
         this.path = (String)properties.remove(PROPERTY_RESOURCE_PATH);
-        this.isBridgedEvent = properties.remove(PROPERTY_BRIDGED_EVENT) != null;
+        this.isBridgedEvent = properties.get(PROPERTY_BRIDGED_EVENT) != null;
         this.readErrorList = (List<Exception>) properties.remove(ResourceHelper.PROPERTY_MARKER_READ_ERROR_LIST);
 
         this.properties = new ValueMapDecorator(properties);

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java?rev=1481860&r1=1481859&r2=1481860&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java Mon May 13 14:15:10 2013
@@ -564,15 +564,13 @@ public class JobManagerImpl
      */
     @Override
     public void handleTopologyEvent(final TopologyEvent event) {
-        if ( this.logger.isDebugEnabled() ) {
-            this.logger.debug("Received topology event {}", event);
-        }
+        this.logger.info("Received topology event {}", event);
 
         // check if there is a change of properties which doesn't affect us
         if ( event.getType() == Type.PROPERTIES_CHANGED ) {
             final Map<String, String> newAllInstances = TopologyCapabilities.getAllInstancesMap(event.getNewView());
             if ( this.topologyCapabilities != null && this.topologyCapabilities.isSame(newAllInstances) ) {
-                logger.debug("No changes in capabilities.");
+                logger.info("No changes in capabilities - ignoring event");
                 return;
             }
         }

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/TopologyCapabilities.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/TopologyCapabilities.java?rev=1481860&r1=1481859&r2=1481860&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/TopologyCapabilities.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/TopologyCapabilities.java Mon May 13 14:15:10 2013
@@ -128,7 +128,7 @@ public class TopologyCapabilities {
         for(final InstanceDescription desc : view.getInstances() ) {
             final String topics = desc.getProperty(PROPERTY_TOPICS);
             if ( topics != null && topics.length() > 0 ) {
-                this.logger.debug("Capabilities of {} : {}", desc.getSlingId(), topics);
+                this.logger.info("Detected capabilities of {} : {}", desc.getSlingId(), topics);
                 for(final String topic : topics.split(",") ) {
                     List<InstanceDescription> list = newCaps.get(topic);
                     if ( list == null ) {