Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 4975 invoked from network); 14 Nov 2007 22:15:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Nov 2007 22:15:05 -0000 Received: (qmail 73282 invoked by uid 500); 14 Nov 2007 22:14:52 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 73235 invoked by uid 500); 14 Nov 2007 22:14:52 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 73226 invoked by uid 99); 14 Nov 2007 22:14:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Nov 2007 14:14:52 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Nov 2007 22:15:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3B12B1A983A; Wed, 14 Nov 2007 14:14:42 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r595091 - in /incubator/cxf/branches/2.0.x-fixes: ./ common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java Date: Wed, 14 Nov 2007 22:14:41 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071114221442.3B12B1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Wed Nov 14 14:14:41 2007 New Revision: 595091 URL: http://svn.apache.org/viewvc?rev=595091&view=rev Log: Merged revisions 594487 via svnmerge from https://svn.apache.org/repos/asf/incubator/cxf/trunk ........ r594487 | mmao | 2007-11-13 06:23:54 -0500 (Tue, 13 Nov 2007) | 3 lines Fix the pmd checks ........ Modified: incubator/cxf/branches/2.0.x-fixes/ (props changed) incubator/cxf/branches/2.0.x-fixes/common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java Propchange: incubator/cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: incubator/cxf/branches/2.0.x-fixes/common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java?rev=595091&r1=595090&r2=595091&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java (original) +++ incubator/cxf/branches/2.0.x-fixes/common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java Wed Nov 14 14:14:41 2007 @@ -88,10 +88,8 @@ if (f.getPropertyInfo().getSchemaComponent() instanceof XSParticle) { XSParticle particle = (XSParticle)f.getPropertyInfo().getSchemaComponent(); XSTerm term = particle.getTerm(); - if (term.isElementDecl()) { - if (term.asElementDecl().getDefaultValue() != null) { - return true; - } + if (term.isElementDecl() && term.asElementDecl().getDefaultValue() != null) { + return true; } } }