Author: gpetracek
Date: Thu Jan 13 22:56:25 2011
New Revision: 1058780
URL: http://svn.apache.org/viewvc?rev=1058780&view=rev
Log:
OWB-500 fix for wls
Modified:
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
Modified:
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java?rev=1058780&r1=1058779&r2=1058780&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
(original)
+++
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
Thu Jan 13 22:56:25 2011
@@ -95,18 +95,15 @@ public class WebScannerService extends A
protected Set<URL> createURLFromMarkerFile() throws Exception
{
Set<URL> listURL = new HashSet<URL>();
- URL[] urls = null;
// Root with beans.xml marker.
- urls = ClasspathUrlFinder.findResourceBases("META-INF/beans.xml",
WebBeansUtil.getCurrentClassLoader());
+ URL[] urls =
ClasspathUrlFinder.findResourceBases("META-INF/beans.xml",
WebBeansUtil.getCurrentClassLoader());
if (urls != null)
{
+ URL addPath;
for (URL url : urls)
{
-
- URL addPath = null;
-
String fileDir = url.getFile();
if (fileDir.endsWith(".jar!/"))
{
@@ -119,6 +116,7 @@ public class WebScannerService extends A
}
addPath = new URL("jar:" + fileDir);
+ url = new URL("jar:" + fileDir);
}
else
{
