svn commit: r1651383 - /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java

[mpetria]

Author: mpetria
Date: Tue Jan 13 15:32:45 2015
New Revision: 1651383

URL: http://svn.apache.org/r1651383
Log:
SLING-4306: fixing trigger disabling

Modified:
    
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java?rev=1651383&r1=1651382&r2=1651383&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
 Tue Jan 13 15:32:45 2015
@@ -264,7 +264,7 @@ public class SimpleDistributionAgent imp
             try {
                 trigger.register(agentBasedRequestHandler);
             } catch (DistributionTriggerException e) {
-                log.error("could not register handler {} from trigger {}", 
agentBasedRequestHandler, trigger);
+                log.error("could not register handler from trigger {} {}", 
trigger, e);
             }
         }
 
@@ -287,7 +287,7 @@ public class SimpleDistributionAgent imp
         try {
             trigger.register(agentBasedRequestHandler);
         } catch (DistributionTriggerException e) {
-            log.error("could not register handler {} from trigger {}", 
agentBasedRequestHandler, trigger);
+            log.error("could not register handler from trigger {} {}", 
trigger, e);
         }
 
     }
@@ -298,9 +298,9 @@ public class SimpleDistributionAgent imp
         }
 
         try {
-            trigger.register(agentBasedRequestHandler);
+            trigger.unregister(agentBasedRequestHandler);
         } catch (DistributionTriggerException e) {
-            log.error("could not register handler {} from trigger {}", 
agentBasedRequestHandler, trigger);
+            log.error("could not unregister handler from trigger {} {}", 
trigger, e);
         }
     }
 
@@ -313,7 +313,7 @@ public class SimpleDistributionAgent imp
             try {
                 trigger.unregister(agentBasedRequestHandler);
             } catch (DistributionTriggerException e) {
-                log.error("could not unregister handler {} from trigger {}", 
agentBasedRequestHandler, trigger);
+                log.error("could not unregister handler trigger {} {}", 
trigger, e);
             }
         }