You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2016/02/23 00:58:15 UTC
svn commit: r1731759 - in /sling/branches/testing/mocks/osgi-mock-1.x: ./
src/main/java/org/apache/sling/testing/mock/osgi/MockEventAdmin.java
Author: sseifert
Date: Mon Feb 22 23:58:14 2016
New Revision: 1731759
URL: http://svn.apache.org/viewvc?rev=1731759&view=rev
Log:
SLING-5544 osgi-mock: Catch RejectedExecutionException in MockEventAdmin
Modified:
sling/branches/testing/mocks/osgi-mock-1.x/ (props changed)
sling/branches/testing/mocks/osgi-mock-1.x/src/main/java/org/apache/sling/testing/mock/osgi/MockEventAdmin.java
Propchange: sling/branches/testing/mocks/osgi-mock-1.x/
------------------------------------------------------------------------------
svn:mergeinfo = /sling/trunk/testing/mocks/osgi-mock:1731758
Modified: sling/branches/testing/mocks/osgi-mock-1.x/src/main/java/org/apache/sling/testing/mock/osgi/MockEventAdmin.java
URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/osgi-mock-1.x/src/main/java/org/apache/sling/testing/mock/osgi/MockEventAdmin.java?rev=1731759&r1=1731758&r2=1731759&view=diff
==============================================================================
--- sling/branches/testing/mocks/osgi-mock-1.x/src/main/java/org/apache/sling/testing/mock/osgi/MockEventAdmin.java (original)
+++ sling/branches/testing/mocks/osgi-mock-1.x/src/main/java/org/apache/sling/testing/mock/osgi/MockEventAdmin.java Mon Feb 22 23:58:14 2016
@@ -22,6 +22,7 @@ import java.util.Map;
import java.util.TreeMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.concurrent.RejectedExecutionException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -69,12 +70,18 @@ public final class MockEventAdmin implem
@Override
public void postEvent(final Event event) {
- asyncHandler.execute(new Runnable() {
- @Override
- public void run() {
- distributeEvent(event);
- }
- });
+ try {
+ asyncHandler.execute(new Runnable() {
+ @Override
+ public void run() {
+ distributeEvent(event);
+ }
+ });
+ }
+ catch (RejectedExecutionException ex) {
+ // ignore
+ log.debug("Ignore rejected execution: " + ex.getMessage(), ex);;
+ }
}
@Override