Mercurial > hg > release > icedtea7-forest-2.5 > jaxp
changeset 382:2b8fd45212c5 jdk7u6-b03
Merge
author | asaha |
---|---|
date | Tue, 20 Mar 2012 10:20:02 -0700 |
parents | 9dc4447a7415 (current diff) 77a453ae863f (diff) |
children | 47fdfdcfafef 3d640f609068 |
files | .hgtags |
diffstat | 2 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Mar 19 23:17:20 2012 -0700 +++ b/.hgtags Tue Mar 20 10:20:02 2012 -0700 @@ -158,5 +158,8 @@ 3fbd87d50fbf4de3987e36ec5f3e8ce1c383ce3d jdk7u4-b11 b4e5df5b18bb75db15ed97da02e5df086d2c7930 jdk7u4-b12 7d18bccaec3781f3d4f2d71879f91e257db2f0f7 jdk7u4-b13 +82c5b3166b3194e7348b2a9d146b6760c9a77128 jdk7u4-b14 +36490d49683f7be9d8fbbe1f8eefa1fe9fe550fa jdk7u4-b15 +5c881231f1161fbc4fe86383ce59dd6a1bbe4f8e jdk7u4-b16 82c5b3166b3194e7348b2a9d146b6760c9a77128 jdk7u6-b01 6211e6e5c90efab0d033a99d9797a60aaad1f203 jdk7u6-b02
--- a/src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java Mon Mar 19 23:17:20 2012 -0700 +++ b/src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java Tue Mar 20 10:20:02 2012 -0700 @@ -45,7 +45,7 @@ * @exception DVFactoryException cannot create an instance of the specified * class name or the default class name */ - public static synchronized final DTDDVFactory getInstance() throws DVFactoryException { + public static final DTDDVFactory getInstance() throws DVFactoryException { return getInstance(DEFAULT_FACTORY_CLASS); } @@ -57,19 +57,19 @@ * @exception DVFactoryException cannot create an instance of the specified * class name or the default class name */ - public static synchronized final DTDDVFactory getInstance(String factoryClass) throws DVFactoryException { - + public static final DTDDVFactory getInstance(String factoryClass) throws DVFactoryException { try { // if the class name is not specified, use the default one return (DTDDVFactory) (ObjectFactory.newInstance(factoryClass, true)); - } catch (ClassCastException e) { + } + catch (ClassCastException e) { throw new DVFactoryException("DTD factory class " + factoryClass + " does not extend from DTDDVFactory."); } } // can't create a new object of this class - protected DTDDVFactory(){} + protected DTDDVFactory() {} /** * return a dtd type of the given name