[JBIDE-24025] returning null when there's no application (was: assertion

error)
jbosstools · Apr 3, 2017 · 8869d16 · 8869d16
1 parent 01b32f1
commit 8869d16
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...s.core/src/org/jboss/tools/openshift/express/internal/core/server/ExpressServerUtils.java b/...s.core/src/org/jboss/tools/openshift/express/internal/core/server/ExpressServerUtils.java
@@ -222,6 +222,9 @@ private static String getUsername(IServerAttributes attributes) {
 	}
 
 	public static ConnectionURL getConnectionUrl(IServerAttributes attributes) {
+		if (attributes == null) {
+			return null;
+		}
 		try {
 			String connectionUrlString = getProjectAttribute(
 					SETTING_CONNECTIONURL, 
@@ -288,6 +291,9 @@ public static String getDefaultDeployFolder(IServerAttributes server) {
 	}
 
 	public static String getDefaultDeployFolder(IApplication application) {
+		if (application == null) {
+			return null;
+		}
 		Assert.isNotNull(application);
 		DeployFolder deployFolder = DeployFolder.getByCartridgeName(application.getCartridge().getName());
 		if (deployFolder == null) {