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 CB38578B9 for ; Wed, 7 Dec 2011 22:18:54 +0000 (UTC) Received: (qmail 33356 invoked by uid 500); 7 Dec 2011 22:18:54 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 33299 invoked by uid 500); 7 Dec 2011 22:18:54 -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 33288 invoked by uid 99); 7 Dec 2011 22:18:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Dec 2011 22:18:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Dec 2011 22:18:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 94A8B23889E1 for ; Wed, 7 Dec 2011 22:18:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1211674 - in /commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder: BinderClassLoader.java DigesterLoader.java Date: Wed, 07 Dec 2011 22:18:29 -0000 To: commits@commons.apache.org From: simonetripodi@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111207221829.94A8B23889E1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: simonetripodi Date: Wed Dec 7 22:18:29 2011 New Revision: 1211674 URL: http://svn.apache.org/viewvc?rev=1211674&view=rev Log: fixed findbugs issue: classloader must be created inside a privileged action Modified: commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/DigesterLoader.java Modified: commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java?rev=1211674&r1=1211673&r2=1211674&view=diff ============================================================================== --- commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java (original) +++ commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java Wed Dec 7 22:18:29 2011 @@ -1,9 +1,5 @@ package org.apache.commons.digester3.binder; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -23,6 +19,14 @@ import java.util.Map; * under the License. */ +import static java.lang.System.getSecurityManager; +import static java.security.AccessController.doPrivileged; + +import java.security.PrivilegedAction; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + final class BinderClassLoader extends ClassLoader { @@ -42,9 +46,28 @@ final class BinderClassLoader PRIMITIVE_TYPES = Collections.unmodifiableMap( primitiveTypes ); } + public static BinderClassLoader createBinderClassLoader( final ClassLoader adaptedClassLoader ) + { + PrivilegedAction action = new PrivilegedAction() + { + + public BinderClassLoader run() + { + return new BinderClassLoader( adaptedClassLoader ); + } + + }; + + if ( getSecurityManager() != null ) + { + return doPrivileged( action ); + } + return action.run(); + } + private final ClassLoader adaptedClassLoader; - public BinderClassLoader( ClassLoader adaptedClassLoader ) + private BinderClassLoader( ClassLoader adaptedClassLoader ) { this.adaptedClassLoader = adaptedClassLoader; } Modified: commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/DigesterLoader.java URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/DigesterLoader.java?rev=1211674&r1=1211673&r2=1211674&view=diff ============================================================================== --- commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/DigesterLoader.java (original) +++ commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/DigesterLoader.java Wed Dec 7 22:18:29 2011 @@ -19,6 +19,8 @@ package org.apache.commons.digester3.bin * under the License. */ +import static org.apache.commons.digester3.binder.BinderClassLoader.createBinderClassLoader; + import java.io.PrintWriter; import java.io.StringWriter; import java.net.MalformedURLException; @@ -196,7 +198,7 @@ public final class DigesterLoader throw new IllegalArgumentException( "Parameter 'classLoader' cannot be null" ); } - this.classLoader = new BinderClassLoader( classLoader ); + this.classLoader = createBinderClassLoader( classLoader ); return this; }