# HG changeset patch
# User asaha
# Date 1331933991 25200
# Node ID 661559d4eb44a0ae96a6227b6031219d719cee17
# Parent  b4a0668533e5ffabafecdba187cea3d3ab19d5b4# Parent  77a453ae863fee408035c8986f7e3bb22b7252cb
Merge

diff -r b4a0668533e5 -r 661559d4eb44 .hgtags
--- a/.hgtags	Wed Mar 07 15:49:58 2012 -0800
+++ b/.hgtags	Fri Mar 16 14:39:51 2012 -0700
@@ -160,3 +160,5 @@
 7d18bccaec3781f3d4f2d71879f91e257db2f0f7 jdk7u4-b13
 82c5b3166b3194e7348b2a9d146b6760c9a77128 jdk7u4-b14
 36490d49683f7be9d8fbbe1f8eefa1fe9fe550fa jdk7u5-b01
+36490d49683f7be9d8fbbe1f8eefa1fe9fe550fa jdk7u4-b15
+5c881231f1161fbc4fe86383ce59dd6a1bbe4f8e jdk7u4-b16
diff -r b4a0668533e5 -r 661559d4eb44 src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java
--- a/src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java	Wed Mar 07 15:49:58 2012 -0800
+++ b/src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java	Fri Mar 16 14:39:51 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