update load build condition

zkoss · May 27, 2016 · 19202a7 · 19202a7
1 parent 7b22bed
commit 19202a7
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/zk/src/org/zkoss/zk/ui/impl/AbstractWebApp.java b/zk/src/org/zkoss/zk/ui/impl/AbstractWebApp.java
@@ -16,7 +16,10 @@
 */
 package org.zkoss.zk.ui.impl;
 
+import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
+import java.util.Enumeration;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -393,7 +396,21 @@ public void sessionDestroyed(Session sess) {
 	public static synchronized String loadBuild() {
 		if (_build == null) {
 			final String FILE = "/metainfo/zk/build";
-			InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(FILE);
+			ClassLoader cl = Thread.currentThread().getContextClassLoader();
+			InputStream is = null;
+			try {
+				Enumeration<URL> en = cl.getResources(FILE.substring(1)); // should not start with "/"
+				while (en.hasMoreElements()) {
+					URL url = en.nextElement();
+					String path = url.getPath();
+					if (path != null && (path.contains("zk.jar!" + FILE) || path.matches("(.*)zk-\\d.*\\.jar\\!" + FILE))) { //the filename of jar might change
+						is = url.openStream();
+						break;
+					}
+				}
+			} catch (IOException e) {
+				//do nothing
+			}
 			if (is == null) {
 				is = AbstractWebApp.class.getResourceAsStream(FILE);
 				if (is == null)