8150969: DEFER from Features API is taking precedence over defer preference in catalog file

Reviewed-by: lancea
This commit is contained in:
Joe Wang 2016-04-06 14:31:38 -07:00
parent 871832c718
commit 88deed35ed
5 changed files with 51 additions and 2 deletions

View file

@ -186,7 +186,7 @@ class CatalogReader extends DefaultHandler implements EntityResolver, URIResolve
}
//override property settings with those from the catalog file
catalog.setResolve(resolve);
catalog.setPrefer(defer);
catalog.setDeferred(defer);
catalogEntry = new CatalogEntry(base, prefer, defer, resolve);
} else {
catalogEntry = new CatalogEntry(base, prefer);