Author: jochen
Date: Thu Jan 5 14:58:37 2006
New Revision: 366326
URL: http://svn.apache.org/viewcvs?rev=366326&view=rev
Log:
Fixed an NPE in the DTDParser.
PR: JAXME-79
Modified:
webservices/jaxme/branches/MAVEN/projects/xs/src/main/java/org/apache/ws/jaxme/xs/util/DTDParser.java
webservices/jaxme/branches/MAVEN/status.xml
Modified:
webservices/jaxme/branches/MAVEN/projects/xs/src/main/java/org/apache/ws/jaxme/xs/util/DTDParser.java
URL:
http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/xs/src/main/java/org/apache/ws/jaxme/xs/util/DTDParser.java?rev=366326&r1=366325&r2=366326&view=diff
==============================================================================
---
webservices/jaxme/branches/MAVEN/projects/xs/src/main/java/org/apache/ws/jaxme/xs/util/DTDParser.java
(original)
+++
webservices/jaxme/branches/MAVEN/projects/xs/src/main/java/org/apache/ws/jaxme/xs/util/DTDParser.java
Thu Jan 5 14:58:37 2006
@@ -705,7 +705,7 @@
throws SAXException {
XsTTopLevelElement result = pSchema.createElement();
result.setName(new XsNCName(getLocalPart(pName)));
- XsGAttrDecls attrDecls;
+ final XsGAttrDecls attrDecls;
if ("EMPTY".equals(pModel)) {
attrDecls = result.createComplexType();
} else if ("ANY".equals(pModel)) {
@@ -724,7 +724,7 @@
} else if (pModel.startsWith("(")) {
String pcData = pModel.substring(1).trim();
if (pcData.startsWith("#PCDATA")) {
- attrDecls = parseMixed(result, pModel, pLocator,
pAttributes.length == 0);
+ attrDecls = parseMixed(result, pModel, pLocator,
pAttributes.length > 0);
} else {
attrDecls = parseChildren(result, pModel, pLocator);
}
Modified: webservices/jaxme/branches/MAVEN/status.xml
URL:
http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/status.xml?rev=366326&r1=366325&r2=366326&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/status.xml (original)
+++ webservices/jaxme/branches/MAVEN/status.xml Thu Jan 5 14:58:37 2006
@@ -85,6 +85,9 @@
Added support for external binding files, based on a
suggestion from Ortwin Glueck (oglueck at apache.org).
</action>
+ <action dev="JW" type="fix" context="xs">
+ Fixed an NPE in the DTDParser. (JAXME-79)
+ </action>
</release>
<release version="0.5" date="2005-Aug-08">
<action dev="JW" type="enhancement" context="js">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
