You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xmlbeans-cvs@xml.apache.org by zi...@apache.org on 2004/01/30 18:28:31 UTC
cvs commit: xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/marshal MarshalStreamUtils.java MarshallerImpl.java
zieg 2004/01/30 09:28:31
Modified: v2/src/marshal/org/apache/xmlbeans/impl/marshal
MarshalStreamUtils.java MarshallerImpl.java
Log:
fix NPE during error reporting
Revision Changes Path
1.14 +10 -8 xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/marshal/MarshalStreamUtils.java
Index: MarshalStreamUtils.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/marshal/MarshalStreamUtils.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- MarshalStreamUtils.java 29 Jan 2004 04:08:56 -0000 1.13
+++ MarshalStreamUtils.java 30 Jan 2004 17:28:31 -0000 1.14
@@ -272,8 +272,6 @@
try {
for (int state = rdr.getEventType(); rdr.hasNext(); state = rdr.next()) {
switch (state) {
-
-
case XMLStreamReader.START_ELEMENT:
return;
case XMLStreamReader.END_ELEMENT:
@@ -305,7 +303,6 @@
break;
default:
- //this case pretty much means malformed xml or a bug
throw new XmlRuntimeException("unexpected xml state:" + state +
"in" + rdr);
}
@@ -322,11 +319,16 @@
Location location,
String sourceName)
{
- final XmlError err = XmlError.forLocation(msg,
- sourceName,
- location.getLineNumber(),
- location.getColumnNumber(),
- location.getCharacterOffset());
+ final XmlError err;
+ if (location != null) {
+ err = XmlError.forLocation(msg,
+ sourceName,
+ location.getLineNumber(),
+ location.getColumnNumber(),
+ location.getCharacterOffset());
+ } else {
+ err = XmlError.forSource(msg, sourceName);
+ }
errors.add(err);
}
1.16 +0 -1 xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/marshal/MarshallerImpl.java
Index: MarshallerImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/marshal/MarshallerImpl.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- MarshallerImpl.java 29 Jan 2004 06:56:07 -0000 1.15
+++ MarshallerImpl.java 30 Jan 2004 17:28:31 -0000 1.16
@@ -85,7 +85,6 @@
private final RuntimeBindingTypeTable typeTable;
private final RuntimeTypeFactory runtimeTypeFactory;
- //REVIEW: can this be static?
private static final XMLOutputFactory XML_OUTPUT_FACTORY =
XMLOutputFactory.newInstance();
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org