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 2015/02/12 02:17:34 UTC
svn commit: r1659118 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java
Author: markrmiller
Date: Thu Feb 12 01:17:34 2015
New Revision: 1659118
URL: http://svn.apache.org/r1659118
Log:
SOLR-7101: JmxMonitoredMap can throw an exception in clear when queryNames fails.
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/JmxMonitoredMap.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=1659118&r1=1659117&r2=1659118&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Thu Feb 12 01:17:34 2015
@@ -77,6 +77,9 @@ Bug Fixes
* SOLR-5890: Delete silently fails if not sent to shard where document was
added (Ishan Chattopadhyaya, Noble Paul)
+* SOLR-7101: JmxMonitoredMap can throw an exception in clear when queryNames fails.
+ (Mark Miller, Wolfgang Hoschek)
+
Optimizations
----------------------
* SOLR-7049: Move work done by the LIST Collections API call to the Collections
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java?rev=1659118&r1=1659117&r2=1659118&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java Thu Feb 12 01:17:34 2015
@@ -117,13 +117,20 @@ public class JmxMonitoredMap<K, V> exten
public void clear() {
if (server != null) {
QueryExp exp = Query.eq(Query.attr("coreHashCode"), Query.value(coreHashCode));
- Set<ObjectName> objectNames = server.queryNames(null, exp);
+
+ Set<ObjectName> objectNames = null;
+ try {
+ objectNames = server.queryNames(null, exp);
+ } catch (Exception e) {
+ LOG.warn("Exception querying for mbeans", e);
+ }
+
if (objectNames != null) {
for (ObjectName name : objectNames) {
try {
server.unregisterMBean(name);
} catch (Exception e) {
- LOG.error("Exception un-registering mbean {}", name, e);
+ LOG.warn("Exception un-registering mbean {}", name, e);
}
}
}