From commits-return-2152-apmail-xmlbeans-commits-archive=xmlbeans.apache.org@xmlbeans.apache.org Wed Jan 12 20:39:31 2005 Return-Path: Delivered-To: apmail-xmlbeans-commits-archive@www.apache.org Received: (qmail 38982 invoked from network); 12 Jan 2005 20:39:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 12 Jan 2005 20:39:31 -0000 Received: (qmail 94134 invoked by uid 500); 12 Jan 2005 20:39:30 -0000 Delivered-To: apmail-xmlbeans-commits-archive@xmlbeans.apache.org Received: (qmail 94106 invoked by uid 500); 12 Jan 2005 20:39:30 -0000 Mailing-List: contact commits-help@xmlbeans.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@xmlbeans.apache.org Delivered-To: mailing list commits@xmlbeans.apache.org Received: (qmail 94092 invoked by uid 99); 12 Jan 2005 20:39:30 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 12 Jan 2005 12:39:29 -0800 Received: (qmail 38955 invoked by uid 65534); 12 Jan 2005 20:39:28 -0000 Date: 12 Jan 2005 20:39:27 -0000 Message-ID: <20050112203927.38953.qmail@minotaur.apache.org> From: radup@apache.org To: commits@xmlbeans.apache.org Subject: svn commit: r124990 - /xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: radup Date: Wed Jan 12 12:39:25 2005 New Revision: 124990 URL: http://svn.apache.org/viewcvs?view=rev&rev=124990 Log: Fixed an NPE in SchemaTypeImpl.getElementType(). Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java?view=diff&rev=124990&p1=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java&r1=124989&p2=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java&r2=124990 ============================================================================== --- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java (original) +++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java Wed Jan 12 12:39:25 2005 @@ -872,7 +872,7 @@ { // Substitution groups SchemaGlobalElement elt = wildcardTypeLoader.findElement(eltName); - SchemaGlobalElement head = elt.substitutionGroup(); + SchemaGlobalElement head = elt == null ? null : elt.substitutionGroup(); if (head == null) return BuiltinSchemaTypeSystem.ST_NO_TYPE; prop = (SchemaProperty)_propertyModelByElementName.get(head.getName()); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org For additional commands, e-mail: commits-help@xmlbeans.apache.org