Return-Path: 
 <commits-return-28896-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 867EBC72A
	for <apmail-cxf-commits-archive@www.apache.org>;
 Mon,  9 Sep 2013 09:15:58 +0000 (UTC)
Received: (qmail 72250 invoked by uid 500); 9 Sep 2013 09:15:58 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 72143 invoked by uid 500); 9 Sep 2013 09:15:57 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 72136 invoked by uid 99); 9 Sep 2013 09:15:57 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Sep 2013 09:15:57 +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; Mon, 09 Sep 2013 09:15:56 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 2DCB623888A6;
	Mon,  9 Sep 2013 09:15:36 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1521008 -
 /cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java
Date: Mon, 09 Sep 2013 09:15:36 -0000
To: commits@cxf.apache.org
From: cschneider@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20130909091536.2DCB623888A6@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: cschneider
Date: Mon Sep  9 09:15:35 2013
New Revision: 1521008

URL: http://svn.apache.org/r1521008
Log:
Guard against null classloader

Modified:
    cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java

Modified: cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java?rev=1521008&r1=1521007&r2=1521008&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java (original)
+++ cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java Mon Sep  9 09:15:35 2013
@@ -31,7 +31,9 @@ public class ProxyClassLoader extends Cl
     private Set<ClassLoader> loaders = new HashSet<ClassLoader>();
 
     public void addLoader(ClassLoader loader) {
-        loaders.add(loader);
+        if (loader != null) {
+            loaders.add(loader);
+        }
     }
 
     public Class<?> findClass(String name) throws ClassNotFoundException {