Author: mreutegg
Date: Mon Sep 30 13:32:20 2019
New Revision: 1867773
URL: http://svn.apache.org/viewvc?rev=1867773&view=rev
Log:
OAK-8656: ListenerStatsData.toCompositeData() throws NPE
Apply slightly modified patch provided by José Cordero
Added:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanTest.java
(with props)
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java?rev=1867773&r1=1867772&r2=1867773&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java
Mon Sep 30 13:32:20 2019
@@ -417,13 +417,13 @@ public class ConsolidatedListenerMBeanIm
mbeans.changeProcessorMBean == null ? -1 :
mbeans.changeProcessorMBean.getPrefilterSkipCount(),
mbeans.changeProcessorMBean == null ? -1 :
mbeans.changeProcessorMBean.getPrefilterExcludeCount(),
mbeans.changeProcessorMBean == null ? -1 :
mbeans.changeProcessorMBean.getPrefilterIncludeCount(),
- mbeans.observerMBean.getQueueSize(),
- mbeans.observerMBean.getLocalEventCount(),
- mbeans.observerMBean.getExternalEventCount(),
- Arrays.toString(mbeans.filterConfigMBean.getPaths()),
- mbeans.filterConfigMBean.isIncludeClusterExternal(),
- mbeans.filterConfigMBean.isIncludeClusterLocal(),
- mbeans.observerMBean.getMaxQueueSize(),
+ mbeans.observerMBean == null ? -1 :
mbeans.observerMBean.getQueueSize(),
+ mbeans.observerMBean == null ? -1 :
mbeans.observerMBean.getLocalEventCount(),
+ mbeans.observerMBean == null ? -1 :
mbeans.observerMBean.getExternalEventCount(),
+ mbeans.filterConfigMBean == null ? "n/a" :
Arrays.toString(mbeans.filterConfigMBean.getPaths()),
+ mbeans.filterConfigMBean != null &&
mbeans.filterConfigMBean.isIncludeClusterExternal(),
+ mbeans.filterConfigMBean != null &&
mbeans.filterConfigMBean.isIncludeClusterLocal(),
+ mbeans.observerMBean == null ? -1 :
mbeans.observerMBean.getMaxQueueSize(),
};
try {
return new CompositeDataSupport(TYPE, FIELD_NAMES, values);
Added:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanTest.java?rev=1867773&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanTest.java
(added)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanTest.java
Mon Sep 30 13:32:20 2019
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.jackrabbit.oak.jcr.observation;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.jcr.observation.EventIterator;
+import javax.jcr.observation.EventListener;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.management.openmbean.TabularData;
+
+import org.apache.jackrabbit.api.jmx.EventListenerMBean;
+import org.apache.jackrabbit.commons.observation.ListenerTracker;
+import org.junit.Test;
+
+public class ConsolidatedListenerMBeanTest {
+
+ @Test
+ public void testListenerStatsData() throws MalformedObjectNameException {
+ ConsolidatedListenerMBeanImpl consolidatedListener = new
ConsolidatedListenerMBeanImpl();
+
+ EventListener listener = new Listener(new AtomicInteger());
+ EventListenerMBean mbean = new ListenerTracker(listener, 0, "/",
false, null, null, false).getListenerMBean();
+
+ Map<String, ObjectName> config = new HashMap<>();
+ config.put("jmx.objectname", new ObjectName("*:*"));
+ consolidatedListener.bindListenerMBean(mbean, config);
+ TabularData data = consolidatedListener.getListenerStats();
+ assertNotNull(data);
+ }
+
+ private static class Listener implements EventListener {
+ private final AtomicInteger eventCount;
+
+ Listener(AtomicInteger eventCount) {
+ this.eventCount = eventCount;
+ }
+
+ @Override
+ public void onEvent(EventIterator events) {
+ for (; events.hasNext(); events.nextEvent()) {
+ eventCount.incrementAndGet();
+ }
+ }
+ }
+}
Propchange:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanTest.java
------------------------------------------------------------------------------
svn:eol-style = native
