1.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Wed Nov 14 17:23:10 2012 -0800
1.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Thu Nov 15 09:18:36 2012 -0800
1.3 @@ -55,14 +55,10 @@
1.4 */
1.5 private Map<String,XMLNode> xmlElementsMap;
1.6 private XMLNode currentNode;
1.7 - private Configuration configuration;
1.8 - private static LayoutParser instance;
1.9 + private final Configuration configuration;
1.10 private String currentRoot;
1.11 private boolean isParsing;
1.12
1.13 - /**
1.14 - * This class is a singleton.
1.15 - */
1.16 private LayoutParser(Configuration configuration) {
1.17 xmlElementsMap = new HashMap<String,XMLNode>();
1.18 this.configuration = configuration;
1.19 @@ -75,10 +71,7 @@
1.20 * @return an instance of the BuilderXML.
1.21 */
1.22 public static LayoutParser getInstance(Configuration configuration) {
1.23 - if (instance == null) {
1.24 - instance = new LayoutParser(configuration);
1.25 - }
1.26 - return instance;
1.27 + return new LayoutParser(configuration);
1.28 }
1.29
1.30 /**
