Fix loading of properties from jar bundles

wocommunity · Jul 7, 2014 · 1027548 · 1027548
1 parent 36c9364
commit 1027548
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java
@@ -33,6 +33,7 @@
 import java.util.Set;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
+import java.util.regex.Pattern;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 
@@ -737,12 +738,15 @@ private void collectMainProps(String userName) {
 					URL userPropertiesPath = null;
 					String mainBundleName = NSProperties._mainBundleName();
 
+					// Look for a jar file name like: myapp[-1.0][-SNAPSHOT].jar
+					Pattern mainBundleJarPattern = Pattern.compile("\\b" + mainBundleName.toLowerCase() + "[-\\.\\d]*(snapshot)?\\.jar");
+
 					while (jarBundles.hasMoreElements()) {
 						URL url = jarBundles.nextElement();
 
 						String urlAsString = url.toString();
 
-						if (urlAsString.contains(mainBundleName + ".jar")) {
+						if (mainBundleJarPattern.matcher(urlAsString.toLowerCase()).find()) {
 							try {
 								propertiesPath = new URL(URLDecoder.decode(urlAsString, CharEncoding.UTF_8));
 								userPropertiesPath = new URL(propertiesPath.toExternalForm() + userName);