Merge pull request #36 from zendtech/bartlomiej

ZSTD-4974 Deploying from Studio on ZS+nginx is not successful
zendtech · May 14, 2015 · 5d1341e · 5d1341e
2 parents de08e6f + 4787ba4
commit 5d1341e
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/zendserver-sdk-java/org.zend.sdk/sdklib/org/zend/sdklib/application/ZendApplication.java b/zendserver-sdk-java/org.zend.sdk/sdklib/org/zend/sdklib/application/ZendApplication.java
@@ -758,7 +758,11 @@ private VhostInfo getVirtualHost(String targetId, String baseUrl)
 		if (hostsList != null) {
 			List<VhostInfo> infos = hostsList.getVhosts();
 			if (infos != null) {
+				VhostInfo defaultVhost = null;
 				for (VhostInfo vhostInfo : infos) {
+					if (vhostInfo.isDefaultVhost()) {
+						defaultVhost = vhostInfo;
+					}
 					String protocol = vhostInfo.isSSL() ? "https" : "http";
 					String host = vhostInfo.getName();
 					if ("*".equals(host)) {
@@ -788,6 +792,8 @@ private VhostInfo getVirtualHost(String targetId, String baseUrl)
 						}
 					}
 				}
+				// Use default vhost if there is no perfect match
+				return defaultVhost;
 			}
 		}
 		return null;