This is an automated email from the ASF dual-hosted git repository. jsedding pushed a commit to branch testing/extra-logging in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
commit e85d6843d5d6501977a3102fdd58e6888b5bd52d Author: Julian Sedding <jsedd...@apache.org> AuthorDate: Fri Sep 29 12:16:29 2023 +0200 debug logging --- .../sling/resourceresolver/impl/FactoryRegistrationHandler.java | 1 + .../sling/resourceresolver/util/events/RecordingListener.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/main/java/org/apache/sling/resourceresolver/impl/FactoryRegistrationHandler.java b/src/main/java/org/apache/sling/resourceresolver/impl/FactoryRegistrationHandler.java index 1227f3c..f0429d7 100644 --- a/src/main/java/org/apache/sling/resourceresolver/impl/FactoryRegistrationHandler.java +++ b/src/main/java/org/apache/sling/resourceresolver/impl/FactoryRegistrationHandler.java @@ -199,6 +199,7 @@ public class FactoryRegistrationHandler implements AutoCloseable { @Override public ResourceResolverFactory getService(final Bundle bundle, final ServiceRegistration<ResourceResolverFactory> registration) { if (FactoryRegistrationHandler.this.factoryRegistrationWorker.isShutdown()) { + LOG.warn("FactoryRegistrationHandler is already closed, returning null for ResourceResolverFactory"); return null; } return new ResourceResolverFactoryImpl(commonFactory, bundle, activator.getServiceUserMapper()); diff --git a/src/test/java/org/apache/sling/resourceresolver/util/events/RecordingListener.java b/src/test/java/org/apache/sling/resourceresolver/util/events/RecordingListener.java index dbeb60f..1751909 100644 --- a/src/test/java/org/apache/sling/resourceresolver/util/events/RecordingListener.java +++ b/src/test/java/org/apache/sling/resourceresolver/util/events/RecordingListener.java @@ -23,6 +23,8 @@ import org.hamcrest.Matcher; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceEvent; import org.osgi.framework.ServiceRegistration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Collection; import java.util.Hashtable; @@ -36,6 +38,8 @@ import static org.hamcrest.MatcherAssert.assertThat; public class RecordingListener extends AbstractAwaitingListener { + private static final Logger LOG = LoggerFactory.getLogger(RecordingListener.class); + private final Collection<ServiceEventDTO> serviceEvents = new ConcurrentLinkedQueue<ServiceEventDTO>(); private ServiceRegistration<RecordingListener> signalRegistration; @@ -71,6 +75,8 @@ public class RecordingListener extends AbstractAwaitingListener { public void serviceChanged(ServiceEvent serviceEvent) { super.serviceChanged(serviceEvent); if (!isInternalEvent(serviceEvent) && recordingFilter.test(serviceEvent)) { + final ServiceEventDTO eventDTO = ServiceEventDTO.create(serviceEvent); + LOG.info("Recorded event({}, {}) | {}", eventDTO.getEventType(), eventDTO.getClasses(), this); serviceEvents.add(ServiceEventDTO.create(serviceEvent)); } }