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 AD5E8200C23 for ; Wed, 22 Feb 2017 10:11:36 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id AC004160B67; Wed, 22 Feb 2017 09:11:36 +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 F3317160B49 for ; Wed, 22 Feb 2017 10:11:35 +0100 (CET) Received: (qmail 47680 invoked by uid 500); 22 Feb 2017 09:11:35 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 47669 invoked by uid 99); 22 Feb 2017 09:11:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Feb 2017 09:11:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0C8A3DFC1C; Wed, 22 Feb 2017 09:11:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cschneider@apache.org To: commits@aries.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: aries-rsa git commit: [ARIES-1693] Use fastbin bundle classloader as fallback Date: Wed, 22 Feb 2017 09:11:35 +0000 (UTC) archived-at: Wed, 22 Feb 2017 09:11:36 -0000 Repository: aries-rsa Updated Branches: refs/heads/master d29a787f8 -> 60b09c81a [ARIES-1693] Use fastbin bundle classloader as fallback Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/60b09c81 Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/60b09c81 Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/60b09c81 Branch: refs/heads/master Commit: 60b09c81af1d0131036693a8405165c8e5539646 Parents: d29a787 Author: Christian Schneider Authored: Wed Feb 22 10:10:40 2017 +0100 Committer: Christian Schneider Committed: Wed Feb 22 10:10:40 2017 +0100 ---------------------------------------------------------------------- .../rsa/provider/fastbin/util/ClassLoaderObjectInputStream.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/60b09c81/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/ClassLoaderObjectInputStream.java ---------------------------------------------------------------------- diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/ClassLoaderObjectInputStream.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/ClassLoaderObjectInputStream.java index 6740938..f9a0bdc 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/ClassLoaderObjectInputStream.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/ClassLoaderObjectInputStream.java @@ -72,7 +72,7 @@ public class ClassLoaderObjectInputStream extends ObjectInputStream { } else { try{ //try to load it with our own classloader (could be e.g. a service exception) - return Class.forName(className, false, this.getClassLoader()); + return Class.forName(className, false, getClass().getClassLoader()); } catch(ClassNotFoundException e2) { //ignore }