You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/11/14 23:14:41 UTC
svn commit: r595091 - in /incubator/cxf/branches/2.0.x-fixes: ./
common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
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;
}
}
}