Author: bergmark
Date: Wed May 28 22:55:18 2014
New Revision: 1598166
URL: http://svn.apache.org/r1598166
Log:
OWB-959 Check before prepending file to front of URL
Modified:
openwebbeans/branches/owb_1.2.x/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
Modified:
openwebbeans/branches/owb_1.2.x/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
URL:
http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java?rev=1598166&r1=1598165&r2=1598166&view=diff
==============================================================================
---
openwebbeans/branches/owb_1.2.x/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
(original)
+++
openwebbeans/branches/owb_1.2.x/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
Wed May 28 22:55:18 2014
@@ -152,8 +152,12 @@ public class WebScannerService extends A
}
else
{
- //X TODO check!
- addPath = "file:" + url + "META-INF/beans.xml";
+ addPath = url + "META-INF/beans.xml";
+
+ if(!addPath.startsWith("file:/"))
+ {
+ addPath = "file:/" + addPath;
+ }
if (logger.isLoggable(Level.FINE))
{
