do not construct SaModelImpl if saLib is not found

thurka · thurka · commit 1a5bd2adfccb · 2020-02-04T18:27:56.000+01:00
diff --git a/visualvm/sa/src/org/graalvm/visualvm/sa/SaModelProvider.java b/visualvm/sa/src/org/graalvm/visualvm/sa/SaModelProvider.java
@@ -73,13 +73,16 @@ public SaModel createModelFor(DataSource ds) {
                     }
                 }
                 File jdkHome = getJdkHome(jvmstat);
-                File saJar = getSaJar(jdkHome);
+                File saLib = getSaJar(jdkHome);
 
-                if (saJar == null) {
-                    return null;
+                if (saLib == null) {
+                    saLib = getSaJmod(jdkHome);
+                    if (saLib == null) {
+                        return null;
+                    }
                 }
                 try {
-                    return new SaModelImpl(jdkHome,saJar,app.getPid());
+                    return new SaModelImpl(jdkHome,saLib,app.getPid());
                 } catch (Exception ex) {
                     LOGGER.log(Level.INFO, "Error getting SA agent", ex);   // NOI18N
                 }
@@ -95,6 +98,9 @@ public SaModel createModelFor(DataSource ds) {
                 
                 if (saLib == null) {
                     saLib = getSaJmod(jdkHome);
+                    if (saLib == null) {
+                        return null;
+                    }
                 }
                 try {
                     return new SaModelImpl(jdkHome,saLib,executable,coreFile);

Original file line number	Diff line number	Diff line change
`@@ -73,13 +73,16 @@ public SaModel createModelFor(DataSource ds) {`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`	`File jdkHome = getJdkHome(jvmstat);`
`76`		`- File saJar = getSaJar(jdkHome);`
	`76`	`+ File saLib = getSaJar(jdkHome);`
`77`	`77`
`78`		`- if (saJar == null) {`
`79`		`- return null;`
	`78`	`+ if (saLib == null) {`
	`79`	`+ saLib = getSaJmod(jdkHome);`
	`80`	`+ if (saLib == null) {`
	`81`	`+ return null;`
	`82`	`+ }`
`80`	`83`	`}`
`81`	`84`	`try {`
`82`		`- return new SaModelImpl(jdkHome,saJar,app.getPid());`
	`85`	`+ return new SaModelImpl(jdkHome,saLib,app.getPid());`
`83`	`86`	`} catch (Exception ex) {`
`84`	`87`	`LOGGER.log(Level.INFO, "Error getting SA agent", ex); // NOI18N`
`85`	`88`	`}`
`@@ -95,6 +98,9 @@ public SaModel createModelFor(DataSource ds) {`
`95`	`98`
`96`	`99`	`if (saLib == null) {`
`97`	`100`	`saLib = getSaJmod(jdkHome);`
	`101`	`+ if (saLib == null) {`
	`102`	`+ return null;`
	`103`	`+ }`
`98`	`104`	`}`
`99`	`105`	`try {`
`100`	`106`	`return new SaModelImpl(jdkHome,saLib,executable,coreFile);`