Merge pull request #961 from scribetw/B85-ZK-3796

ZK-3796: unexpectedly loaded metainfo/zk/build in zpoi.jar causes lic…
zkoss · Nov 22, 2017 · 562b29d · 562b29d
2 parents d7161ce + 4a028bc
commit 562b29d
Show file tree

Hide file tree

Showing 2 changed files with 2 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
@@ -403,7 +403,7 @@ public static synchronized String loadBuild() {
 				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
+					if (path != null && path.matches(".*/zk(-\\d[^/]*?)?\\.jar\\!?" + FILE + "$")) { //the filename of jar might change
 						is = url.openStream();
 						break;
 					}

diff --git a/zkdoc/release-note b/zkdoc/release-note
@@ -8,6 +8,7 @@ ZK 8.5.1
   ZK-3789: Animation onRestore cause redrawn in CKEditor
   ZK-3794: Textbox cut the bottom of text
   ZK-3795: Progressmeter is not completely filled
+  ZK-3796: unexpectedly loaded metainfo/zk/build in zpoi.jar causes license checking failure
 
 * Upgrade Notes