Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A5F78200CB8 for ; Sat, 1 Jul 2017 14:43:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A40EC160BEA; Sat, 1 Jul 2017 12:43:45 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E9FCC160BD2 for ; Sat, 1 Jul 2017 14:43:44 +0200 (CEST) Received: (qmail 43594 invoked by uid 500); 1 Jul 2017 12:43:44 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 43578 invoked by uid 99); 1 Jul 2017 12:43:44 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Jul 2017 12:43:44 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 345F73A1970 for ; Sat, 1 Jul 2017 12:43:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1800498 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/CdiArchive.java Date: Sat, 01 Jul 2017 12:43:41 -0000 To: commits@openwebbeans.apache.org From: rmannibucau@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170701124343.345F73A1970@svn01-us-west.apache.org> archived-at: Sat, 01 Jul 2017 12:43:45 -0000 Author: rmannibucau Date: Sat Jul 1 12:43:40 2017 New Revision: 1800498 URL: http://svn.apache.org/viewvc?rev=1800498&view=rev Log: avoid to add twice the custom archive passed to CdiArchive Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/CdiArchive.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/CdiArchive.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/CdiArchive.java?rev=1800498&r1=1800497&r2=1800498&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/CdiArchive.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/CdiArchive.java Sat Jul 1 12:43:40 2017 @@ -56,23 +56,28 @@ public class CdiArchive implements Archi Filter userFilter, Archive customArchive) { Collection archives = new ArrayList<>(); - if (customArchive != null) - { - archives.add(userFilter != null ? new FilteredArchive(customArchive, userFilter) : customArchive); - } + boolean customAdded = false; for (URL url : urls.values()) { List urlClasses = new ArrayList<>(); BeanArchiveInformation beanArchiveInfo = beanArchiveService.getBeanArchiveInformation(url); + final boolean custom = "openwebbeans".equals(url.getProtocol()); Archive archive = new FilteredArchive( - "openwebbeans".equals(url.getProtocol()) ? customArchive : ClasspathArchive.archive(loader, url), + custom ? customArchive : ClasspathArchive.archive(loader, url), new BeanArchiveFilter(beanArchiveInfo, urlClasses, userFilter)); + if (!customAdded && custom) + { + customAdded = true; + } classesByUrl.put(url.toExternalForm(), new FoundClasses(url, urlClasses, beanArchiveInfo)); archives.add(archive); } - + if (!customAdded && customArchive != null) + { + archives.add(userFilter != null ? new FilteredArchive(customArchive, userFilter) : customArchive); + } delegate = new CompositeArchive(archives); }