From bd2fa9abe6fe8ed85be4b0eefc39cc7a35ca9313 Mon Sep 17 00:00:00 2001 From: Jonathan Gibbons Date: Mon, 15 Feb 2016 19:52:03 -0800 Subject: [PATCH] 8149886: 16 windows tests broke with recent putback Reviewed-by: sundar --- .../com/sun/tools/doclets/internal/toolkit/util/Extern.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java index e043db17293..350e80707e1 100644 --- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java +++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -257,8 +257,8 @@ public class Extern { try { if (file.exists() && file.canRead()) { boolean pathIsRelative = - !DocFile.createFileForInput(configuration, path).isAbsolute() - && !isUrl(path); + !isUrl(path) + && !DocFile.createFileForInput(configuration, path).isAbsolute(); readPackageList(file.openInputStream(), path, pathIsRelative); } else { throw new Fault(configuration.getText("doclet.File_error", file.getPath()), null);