You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2014/10/28 13:43:59 UTC

svn commit: r1634860 - /sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java

Author: tommaso
Date: Tue Oct 28 12:43:59 2014
New Revision: 1634860

URL: http://svn.apache.org/r1634860
Log:
SLING-4106 - adding exception handling for trigger (un)registration

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

Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java?rev=1634860&r1=1634859&r2=1634860&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java Tue Oct 28 12:43:59 2014
@@ -53,6 +53,7 @@ import org.apache.sling.replication.seri
 import org.apache.sling.replication.serialization.ReplicationPackageReadingException;
 import org.apache.sling.replication.trigger.ReplicationRequestHandler;
 import org.apache.sling.replication.trigger.ReplicationTrigger;
+import org.apache.sling.replication.trigger.ReplicationTriggerException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -241,7 +242,11 @@ public class SimpleReplicationAgent impl
         agentBasedRequestHandler = new AgentBasedRequestHandler(this);
 
         for (ReplicationTrigger trigger : triggers) {
-            trigger.register(agentBasedRequestHandler);
+            try {
+                trigger.register(agentBasedRequestHandler);
+            } catch (ReplicationTriggerException e) {
+                log.error("could not register handler {} from trigger {}", agentBasedRequestHandler, trigger);
+            }
         }
 
         if (!isPassive()) {
@@ -253,7 +258,11 @@ public class SimpleReplicationAgent impl
         log.info("disabling agent");
 
         for (ReplicationTrigger trigger : triggers) {
-            trigger.unregister(agentBasedRequestHandler);
+            try {
+                trigger.unregister(agentBasedRequestHandler);
+            } catch (ReplicationTriggerException e) {
+                log.error("could not unregister handler {} from trigger {}", agentBasedRequestHandler, trigger);
+            }
         }
 
         agentBasedRequestHandler = null;