diff -r c348e06f0e82 -r d601e4bba306 jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java --- a/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java Thu Apr 12 08:38:26 2012 -0700 +++ b/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java Tue Apr 17 11:17:59 2012 -0700 @@ -34,6 +34,7 @@ import java.util.Properties; import java.util.StringTokenizer; +import com.sun.org.apache.xalan.internal.utils.SecuritySupport; /** * Provides information about encodings. Depends on the Java runtime @@ -41,7 +42,7 @@ * to override encoding names and provide the last printable character * for each encoding. * - * @version $Revision: 1.9 $ $Date: 2009/12/01 22:17:31 $ + * @version $Revision: 1.11 $ $Date: 2010-11-01 04:34:44 $ * @author Assaf Arkin */ @@ -324,9 +325,7 @@ } if (is == null) { - SecuritySupport ss = SecuritySupport.getInstance(); - is = ss.getResourceAsStream(ObjectFactory.findClassLoader(), - ENCODINGS_FILE); + is = SecuritySupport.getResourceAsStream(ENCODINGS_FILE); } Properties props = new Properties();