You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/11/19 20:50:50 UTC
svn commit: r1640625 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
Author: markrmiller
Date: Wed Nov 19 19:50:49 2014
New Revision: 1640625
URL: http://svn.apache.org/r1640625
Log:
SOLR-3774: Solr adds RequestHandler SolrInfoMBeans twice to the JMX server.
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1640625&r1=1640624&r2=1640625&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Wed Nov 19 19:50:49 2014
@@ -262,6 +262,9 @@ Bug Fixes
* SOLR-6738: Admin UI - Escape Data on Plugins-View (steffkes)
+* SOLR-3774: Solr adds RequestHandler SolrInfoMBeans twice to the JMX server.
+ (Tomás Fernández Löbbe, hossman, Mark Miller)
+
Optimizations
----------------------
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java?rev=1640625&r1=1640624&r2=1640625&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java Wed Nov 19 19:50:49 2014
@@ -693,10 +693,14 @@ public class SolrResourceLoader implemen
for (SolrInfoMBean bean : arr) {
- try {
- infoRegistry.put(bean.getName(), bean);
- } catch (Exception e) {
- log.warn("could not register MBean '" + bean.getName() + "'.", e);
+ // Too slow? I suspect not, but we may need
+ // to start tracking this in a Set.
+ if (!infoRegistry.containsValue(bean)) {
+ try {
+ infoRegistry.put(bean.getName(), bean);
+ } catch (Exception e) {
+ log.warn("could not register MBean '" + bean.getName() + "'.", e);
+ }
}
}
}