Skip to content

Commit 7f2d3e2

Browse files
committed
minor change
1 parent 12424db commit 7f2d3e2

3 files changed

Lines changed: 4 additions & 5 deletions

File tree

src/main/java/org/xmlobjects/schema/SchemaHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public Set<String> getTargetNamespaces() {
176176
return schemas.keySet();
177177
}
178178

179-
public SchemaHandler copy(SchemaHandler other) {
179+
public SchemaHandler copyFrom(SchemaHandler other) {
180180
schemas.putAll(other.schemas);
181181
visitedSchemaLocations.putAll(other.visitedSchemaLocations);
182182
userSchemaLocations.putAll(other.userSchemaLocations);

src/main/java/org/xmlobjects/stream/XMLWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ public void writeMixedContent(String mixedContent) throws XMLWriteException {
360360

361361
public <T> ObjectSerializer<T> getOrCreateSerializer(Class<? extends ObjectSerializer<T>> type) throws ObjectSerializeException {
362362
ObjectSerializer<?> cachedSerializer = serializerCache.get(type);
363-
if (cachedSerializer != null && type.isAssignableFrom(cachedSerializer.getClass())) {
363+
if (cachedSerializer != null) {
364364
return type.cast(cachedSerializer);
365365
} else {
366366
try {

src/main/java/org/xmlobjects/stream/XMLWriterFactory.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.xmlobjects.util.xml.SAXOutputHandler;
1212
import org.xmlobjects.util.xml.SAXWriter;
1313

14-
import javax.xml.transform.TransformerConfigurationException;
1514
import javax.xml.transform.TransformerFactory;
1615
import javax.xml.transform.dom.DOMResult;
1716
import javax.xml.transform.sax.SAXTransformerFactory;
@@ -87,14 +86,14 @@ public XMLWriter createWriter(StreamResult result, String encoding) throws XMLWr
8786
public XMLWriter createWriter(DOMResult result) throws XMLWriteException {
8887
try {
8988
if (transformerFactory == null) {
90-
transformerFactory = (SAXTransformerFactory) TransformerFactory.newInstance();
89+
transformerFactory = (SAXTransformerFactory) TransformerFactory.newDefaultInstance();
9190
}
9291

9392
TransformerHandler handler = transformerFactory.newTransformerHandler();
9493
handler.setResult(result);
9594

9695
return createWriter(handler);
97-
} catch (TransformerConfigurationException e) {
96+
} catch (Exception e) {
9897
throw new XMLWriteException("Caused by:", e);
9998
}
10099
}

0 commit comments

Comments
 (0)