Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9674110A0A for ; Tue, 13 Jan 2015 15:32:45 +0000 (UTC) Received: (qmail 86874 invoked by uid 500); 13 Jan 2015 15:32:47 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 86808 invoked by uid 500); 13 Jan 2015 15:32:47 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 86798 invoked by uid 99); 13 Jan 2015 15:32:47 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jan 2015 15:32:47 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id DEE0BAC0024; Tue, 13 Jan 2015 15:32:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1651383 - /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java Date: Tue, 13 Jan 2015 15:32:46 -0000 To: commits@sling.apache.org From: mpetria@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150113153246.DEE0BAC0024@hades.apache.org> 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); } }