svn commit: r1702669 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java

[us...@apache.org]

Author: uschindler
Date: Sat Sep 12 19:21:32 2015
New Revision: 1702669

URL: http://svn.apache.org/r1702669
Log:
LUCENE-6795: Improve SystemInfoHandler for IBM J9 OperatingSystemMXBean (some properties may throw UOE)

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java?rev=1702669&r1=1702668&r2=1702669&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java Sat Sep 12 19:21:32 2015
@@ -29,6 +29,7 @@ import java.lang.management.ManagementFa
 import java.lang.management.OperatingSystemMXBean;
 import java.lang.management.PlatformManagedObject;
 import java.lang.management.RuntimeMXBean;
+import java.lang.reflect.InvocationTargetException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.charset.Charset;
@@ -216,9 +217,15 @@ public class SystemInfoHandler extends R
       final BeanInfo beanInfo = Introspector.getBeanInfo(intf, intf.getSuperclass(), Introspector.IGNORE_ALL_BEANINFO);
       for (final PropertyDescriptor desc : beanInfo.getPropertyDescriptors()) {
         final String name = desc.getName();
-        final Object v = desc.getReadMethod().invoke(obj);
-        if(v != null && info.get(name) == null) {
-          info.add(name, v);
+        if (info.get(name) == null) {
+          try {
+            final Object v = desc.getReadMethod().invoke(obj);
+            if(v != null) {
+              info.add(name, v);
+            }
+          } catch (InvocationTargetException ite) {
+            // ignore (some properties throw UOE)
+          }
         }
       }
     }