Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 68B7F1859A for ; Fri, 11 Dec 2015 20:08:20 +0000 (UTC) Received: (qmail 80694 invoked by uid 500); 11 Dec 2015 20:08:15 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 80619 invoked by uid 500); 11 Dec 2015 20:08:15 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 80607 invoked by uid 99); 11 Dec 2015 20:08:15 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Dec 2015 20:08:15 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id D08C2C0288 for ; Fri, 11 Dec 2015 20:08:14 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.446 X-Spam-Level: X-Spam-Status: No, score=0.446 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id zCu_VBj35y4O for ; Fri, 11 Dec 2015 20:08:14 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with ESMTP id 83A2320F5E for ; Fri, 11 Dec 2015 20:08:13 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id C5D04E0044 for ; Fri, 11 Dec 2015 20:08:12 +0000 (UTC) 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 C850C3A01D9 for ; Fri, 11 Dec 2015 20:08:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1719524 - /commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/WeaveProcessor.java Date: Fri, 11 Dec 2015 20:08:12 -0000 To: commits@commons.apache.org From: mbenson@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151211200812.C850C3A01D9@svn01-us-west.apache.org> Author: mbenson Date: Fri Dec 11 20:08:12 2015 New Revision: 1719524 URL: http://svn.apache.org/viewvc?rev=1719524&view=rev Log: account for the case in which Weavers are installed on the same CP as the cw-processor in addition to TCCL Modified: commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/WeaveProcessor.java Modified: commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/WeaveProcessor.java URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/WeaveProcessor.java?rev=1719524&r1=1719523&r2=1719524&view=diff ============================================================================== --- commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/WeaveProcessor.java (original) +++ commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/WeaveProcessor.java Fri Dec 11 20:08:12 2015 @@ -49,6 +49,11 @@ public class WeaveProcessor { static { final List weavers = new ArrayList(); + if (!Thread.currentThread().getContextClassLoader().equals(Weaver.class.getClassLoader())) { + for (final Weaver weaver : ServiceLoader.load(Weaver.class, Weaver.class.getClassLoader())) { + weavers.add(weaver); + } + } for (final Weaver weaver : ServiceLoader.load(Weaver.class)) { weavers.add(weaver); }