removed duplicated code, parse(InputSource) is enough to cover all the cases
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/digester/trunk@1139059 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/commons/digester3/Digester.java b/src/main/java/org/apache/commons/digester3/Digester.java
index 0383a69..4a7ff4a 100644
--- a/src/main/java/org/apache/commons/digester3/Digester.java
+++ b/src/main/java/org/apache/commons/digester3/Digester.java
@@ -1549,12 +1549,10 @@
throw new IllegalArgumentException( "File to parse is null" );
}
- configure();
InputSource input = new InputSource( new FileInputStream( file ) );
input.setSystemId( file.toURI().toURL().toString() );
- getXMLReader().parse( input );
- cleanup();
- return ( this.<T> getRoot() );
+
+ return ( this.<T> parse( input ) );
}
/**
@@ -1599,11 +1597,7 @@
throw new IllegalArgumentException( "InputStream to parse is null" );
}
- configure();
- InputSource is = new InputSource( input );
- getXMLReader().parse( is );
- cleanup();
- return ( this.<T> getRoot() );
+ return ( this.<T> parse( new InputSource( input ) ) );
}
/**
@@ -1624,11 +1618,7 @@
throw new IllegalArgumentException( "Reader to parse is null" );
}
- configure();
- InputSource is = new InputSource( reader );
- getXMLReader().parse( is );
- cleanup();
- return ( this.<T> getRoot() );
+ return ( this.<T> parse( new InputSource( reader ) ) );
}
/**
@@ -1649,11 +1639,7 @@
throw new IllegalArgumentException( "String URI to parse is null" );
}
- configure();
- InputSource is = createInputSourceFromURL( uri );
- getXMLReader().parse( is );
- cleanup();
- return ( this.<T> getRoot() );
+ return ( this.<T> parse( createInputSourceFromURL( uri ) ) );
}
/**
@@ -1675,11 +1661,7 @@
throw new IllegalArgumentException( "URL to parse is null" );
}
- configure();
- InputSource is = createInputSourceFromURL( url );
- getXMLReader().parse( is );
- cleanup();
- return ( this.<T> getRoot() );
+ return ( this.<T> parse( createInputSourceFromURL( url ) ) );
}
/**
