[openwebbeans] branch master updated: [OWB-1363] prescanned cdi se scanner - enable to reuse addClassesDeploymentUrl instead of doing it manually outside

[rm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new 520cd58  [OWB-1363] prescanned cdi se scanner - enable to reuse addClassesDeploymentUrl instead of doing it manually outside
520cd58 is described below

commit 520cd5819a71c394daf1baa2f25c30f60dbb7eaf
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Wed Dec 30 14:35:52 2020 +0100

    [OWB-1363] prescanned cdi se scanner - enable to reuse addClassesDeploymentUrl instead of doing it manually outside
---
 .../openwebbeans/se/CDISeScannerService.java       | 31 +++++++++++++---------
 .../se/PreScannedCDISeScannerService.java          |  1 +
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/webbeans-se/src/main/java/org/apache/openwebbeans/se/CDISeScannerService.java b/webbeans-se/src/main/java/org/apache/openwebbeans/se/CDISeScannerService.java
index e61ce8b..9780a78 100644
--- a/webbeans-se/src/main/java/org/apache/openwebbeans/se/CDISeScannerService.java
+++ b/webbeans-se/src/main/java/org/apache/openwebbeans/se/CDISeScannerService.java
@@ -89,21 +89,26 @@ public class CDISeScannerService extends AbstractMetaDataDiscovery
 
         if (!classes.isEmpty())
         {
-            try
+            addClassesDeploymentUrl();
+        }
+    }
+
+    protected void addClassesDeploymentUrl()
+    {
+        try
+        {
+            addDeploymentUrl(CDISeBeanArchiveService.EMBEDDED_URL, new URL("openwebbeans", null, 0, "cdise", new URLStreamHandler()
             {
-                addDeploymentUrl(CDISeBeanArchiveService.EMBEDDED_URL, new URL("openwebbeans", null, 0, "cdise", new URLStreamHandler()
+                @Override
+                protected URLConnection openConnection(URL u) throws IOException
                 {
-                    @Override
-                    protected URLConnection openConnection(URL u) throws IOException
-                    {
-                        return null;
-                    }
-                }));
-            }
-            catch (MalformedURLException e)
-            {
-                throw new IllegalArgumentException(e); // quite unlikely
-            }
+                    return null;
+                }
+            }));
+        }
+        catch (MalformedURLException e)
+        {
+            throw new IllegalArgumentException(e); // quite unlikely
         }
     }
 
diff --git a/webbeans-se/src/main/java/org/apache/openwebbeans/se/PreScannedCDISeScannerService.java b/webbeans-se/src/main/java/org/apache/openwebbeans/se/PreScannedCDISeScannerService.java
index 80130b0..14f7897 100644
--- a/webbeans-se/src/main/java/org/apache/openwebbeans/se/PreScannedCDISeScannerService.java
+++ b/webbeans-se/src/main/java/org/apache/openwebbeans/se/PreScannedCDISeScannerService.java
@@ -61,6 +61,7 @@ public class PreScannedCDISeScannerService extends CDISeScannerService
                 throw new IllegalArgumentException(e);
             }
         }).toArray(Class[]::new);
+        addClassesDeploymentUrl();
         final BeanArchiveService beanArchiveService = webBeansContext.getBeanArchiveService();
         archive = new CdiArchive(
                 beanArchiveService, WebBeansUtil.getCurrentClassLoader(),