GH-442 handle null returned from getCommandLine() and getJvmArgs()

Author: thurka

visualvm/application/src/org/graalvm/visualvm/application/ApplicationDescriptor.java

@@ -167,7 +167,7 @@ protected static String resolveCustomName(Application application) {
         Jvm jvm = JvmFactory.getJVMFor(application);
         if (jvm.isBasicInfoSupported()) {
             String args = jvm.getJvmArgs();
-            int propIndex = args.indexOf(DISPLAY_NAME_PROPERTY);
+            int propIndex = args != null ? args.indexOf(DISPLAY_NAME_PROPERTY) : -1;
 
             if (propIndex != -1) {  // display name propery detected on commandline
                 propIndex += DISPLAY_NAME_PROPERTY.length();

visualvm/application/src/org/graalvm/visualvm/application/type/JavaPluginApplicationTypeFactory.java

@@ -51,7 +51,7 @@ public ApplicationType createModelFor(Application application) {
         Jvm jvm = JvmFactory.getJVMFor(application);
         if (jvm.isBasicInfoSupported()) {
             String args = jvm.getJvmArgs();
-            int plugin_index = args.indexOf(JAVA_PLUGIN);
+            int plugin_index = args != null ? args.indexOf(JAVA_PLUGIN) : -1;
             if (plugin_index != -1) {
                 String version;
                 int version_index = plugin_index + JAVA_PLUGIN.length();

visualvm/application/src/org/graalvm/visualvm/application/type/JavaWebStartApplicationTypeFactory.java

@@ -50,8 +50,7 @@ public ApplicationType createModelFor(Application application) {
         Jvm jvm = JvmFactory.getJVMFor(application);
         if (jvm.isBasicInfoSupported()) {
             String args = jvm.getJvmArgs();
-            int jws_index = args.indexOf(JWS);
-            if (jws_index != -1) {
+            if (args != null && args.contains(JWS)) {
                 return new JavaWebStartApplicationType("");
             }
         }

visualvm/application/src/org/graalvm/visualvm/application/type/NetBeansApplicationTypeFactory.java

@@ -66,7 +66,7 @@ private boolean isNetBeans(Jvm jvm, String mainClass) {
 
     protected Set<String> computeClusters(Jvm jvm) {
         String args = jvm.getJvmArgs();
-        int clusterIndex = args.indexOf(NETBEANS_DIRS);
+        int clusterIndex = args != null ? args.indexOf(NETBEANS_DIRS) : -1;
         String pathSeparator = jvm.getJavaHome().contains("\\")?";":":";    // NOI18N
         String separator = pathSeparator.equals(":")?"/":"\\";      // NOI18N
         Set<String> clusters = new HashSet<>();

visualvm/jvm/src/org/graalvm/visualvm/jvm/JVMImpl.java

@@ -595,7 +595,7 @@ protected void initStaticData() {
 
     private String getJvmArgsJvmstat() {
         String args = jvmstatModel.getJvmArgs();
-        if (args.length() == 1024) {
+        if (args != null && args.length() == 1024) {
             String longArgs = null;
             AttachModel attach = getAttach();
             if (attach != null) {

visualvm/tools/src/org/graalvm/visualvm/tools/jvmstat/JvmJvmstatModel.java

@@ -228,11 +228,14 @@ public boolean isAttachable() {
 
     public String getMainArgs() {
         String commandLine = getCommandLine();
-        String arg0 = getFirstArgument();
 
-        int firstSpace = arg0.length();
-        if (firstSpace < commandLine.length()) {
-            return commandLine.substring(firstSpace);
+        if (commandLine != null) {
+            String arg0 = getFirstArgument();
+
+            int firstSpace = arg0.length();
+            if (firstSpace < commandLine.length()) {
+                return commandLine.substring(firstSpace);
+            }
         }
         return null;
     }
@@ -248,6 +251,8 @@ public String getMainArgs() {
      */
     public String getMainClass() {
         String mainClassName = getFirstArgument();
+
+        if (mainClassName == null) return null;
         // if we are on localhost try read main class from jar file
         if (application.isLocalApplication()) {
             File jarFile = new File(mainClassName);
@@ -278,6 +283,7 @@ private String getFirstArgument() {
         String commandLine = getCommandLine();
         String mainClassName = null;
 
+        if (commandLine == null) return mainClassName;
         // search for jar file
         int jarIndex = commandLine.indexOf(JAR_SUFFIX); 
         if (jarIndex != -1) {