Merge branch 'master' into graal

Author: thurka

plugins/jsyntaxpane-lib/external/jsyntaxpane/pom.xml

@@ -25,7 +25,7 @@
     <pluginRepository>
       <id>jflex</id>
       <name>JFlex repository</name>
-      <url>http://jflex.sourceforge.net/repo/</url>
+      <url>https://jflex.sourceforge.net/repo/</url>
     </pluginRepository>
   </pluginRepositories>
 

visualvm/build-nb-ml.sh

@@ -22,7 +22,7 @@ if [ -e l10n ]; then
   cd l10n
   hg pull 
 else
-  hg clone http://hg.netbeans.org/releases/l10n/
+  hg clone https://hg.netbeans.org/releases/l10n/
   cd l10n
 fi
 

visualvm/maven-repo.sh

@@ -1,4 +1,4 @@
-export MAVEN_CENTRAL_REPO_URL=http://repo1.maven.org/maven2/
+export MAVEN_CENTRAL_REPO_URL=https://repo1.maven.org/maven2/
 export MAVEN_NEXUS_LOCAL_DIR=/tmp/visualvm-nexus
 export MAVEN_REPO=/tmp/maven-visualvm
 export MAVEN_REPO_URL=file://$MAVEN_REPO

visualvm/sampler/src/org/graalvm/visualvm/sampler/cpu/ThreadsCPU.java

@@ -29,6 +29,8 @@
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.management.InstanceNotFoundException;
 import javax.management.MBeanException;
 import javax.management.MBeanServerConnection;
@@ -42,9 +44,11 @@
  */
 public class ThreadsCPU {
     private static final ObjectName THREAD_NAME = getThreadName();
+    private static final Logger LOGGER = Logger.getLogger(ThreadsCPU.class.getName());
 
     private final ThreadMXBean threadBean;
     private final MBeanServerConnection connection;
+    private boolean useBulkOperation = true;
 
     public ThreadsCPU(ThreadMXBean bean, MBeanServerConnection conn) {
         threadBean = bean;
@@ -54,9 +58,26 @@ public ThreadsCPU(ThreadMXBean bean, MBeanServerConnection conn) {
     public ThreadsCPUInfo getThreadsCPUInfo() throws MBeanException, ReflectionException, IOException, InstanceNotFoundException {
         long[] ids = threadBean.getAllThreadIds();
         ThreadInfo[] tids = threadBean.getThreadInfo(ids);
-        Object[] args = new Object[] {ids};
-        String[] sigs = new String[] {"[J"};  // NOI18N
-        long[] tinfo = (long[])connection.invoke(THREAD_NAME, "getThreadCpuTime", args, sigs);   // NOI18N
+        long[] tinfo;
+
+        if (useBulkOperation) {
+            Object[] args = new Object[] {ids};
+            String[] sigs = new String[] {"[J"};  // NOI18N
+
+            try {
+                tinfo = (long[])connection.invoke(THREAD_NAME, "getThreadCpuTime", args, sigs);  // NOI18N
+            } catch (javax.management.ReflectionException ex) {
+                LOGGER.log(Level.INFO, "getThreadCpuTime failed", ex);
+                useBulkOperation = false;
+                return getThreadsCPUInfo();
+            }
+        } else {
+            tinfo = new long[ids.length];
+
+            for (int i = 0; i < ids.length; i++) {
+                tinfo[i] = threadBean.getThreadCpuTime(ids[i]);
+            }
+        }
         long time = System.currentTimeMillis();
 
         return new ThreadsCPUInfo(time,tids,tinfo);