Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 49253 invoked from network); 6 Sep 2010 04:47:32 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 Sep 2010 04:47:32 -0000 Received: (qmail 30750 invoked by uid 500); 6 Sep 2010 04:47:31 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 30622 invoked by uid 500); 6 Sep 2010 04:47:29 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 30615 invoked by uid 99); 6 Sep 2010 04:47:28 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Sep 2010 04:47:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 06 Sep 2010 04:47:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C8C68238890A; Mon, 6 Sep 2010 04:46:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r992940 - /geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java Date: Mon, 06 Sep 2010 04:46:49 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100906044649.C8C68238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Mon Sep 6 04:46:49 2010 New Revision: 992940 URL: http://svn.apache.org/viewvc?rev=992940&view=rev Log: add null check Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java?rev=992940&r1=992939&r2=992940&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java Mon Sep 6 04:46:49 2010 @@ -176,7 +176,7 @@ public class XmlBeansUtil { XmlValidationError validationError = (XmlValidationError) o; List expected = validationError.getExpectedQNames(); QName actual = validationError.getOffendingQName(); - if (ignoreElements.contains(actual.getLocalPart())) { + if (actual != null && ignoreElements.contains(actual.getLocalPart())) { iterator.remove(); logger.warn(actual.getLocalPart() + " is not supported yet."); }