1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDParser.java Thu Aug 08 10:10:38 2013 -0700
1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDParser.java Fri Aug 23 09:57:21 2013 +0100
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -57,7 +57,7 @@
1.11 * @author David Brownell
1.12 * @author Janet Koenig
1.13 * @author Kohsuke KAWAGUCHI
1.14 - * @version $Id: DTDParser.java,v 1.2 2009-04-16 15:25:49 snajper Exp $
1.15 + * @version $Id: DTDParser.java,v 1.2 2009/04/16 15:25:49 snajper Exp $
1.16 */
1.17 public class DTDParser {
1.18 public final static String TYPE_CDATA = "CDATA";
1.19 @@ -215,25 +215,25 @@
1.20 */
1.21 public void parse(String uri)
1.22 throws IOException, SAXException {
1.23 - InputSource inSource;
1.24 + InputSource in;
1.25
1.26 init();
1.27 // System.out.println ("parse (\"" + uri + "\")");
1.28 - inSource = resolver.resolveEntity(null, uri);
1.29 + in = resolver.resolveEntity(null, uri);
1.30
1.31 // If custom resolver punts resolution to parser, handle it ...
1.32 - if (inSource == null) {
1.33 - inSource = Resolver.createInputSource(new java.net.URL(uri), false);
1.34 + if (in == null) {
1.35 + in = Resolver.createInputSource(new java.net.URL(uri), false);
1.36
1.37 // ... or if custom resolver doesn't correctly construct the
1.38 // input entity, patch it up enough so relative URIs work, and
1.39 // issue a warning to minimize later confusion.
1.40 - } else if (inSource.getSystemId() == null) {
1.41 + } else if (in.getSystemId() == null) {
1.42 warning("P-065", null);
1.43 - inSource.setSystemId(uri);
1.44 + in.setSystemId(uri);
1.45 }
1.46
1.47 - parseInternal(inSource);
1.48 + parseInternal(in);
1.49 }
1.50
1.51 // makes sure the parser is reset to "before a document"
