changeset 3469:a2cdf1f97da8

8149886: 16 windows tests broke with recent putback Reviewed-by: sundar
author jjg
date Mon, 15 Feb 2016 19:52:03 -0800
parents 51c59975ddfd
children a910d5c72bbc
files src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java	Mon Feb 15 17:17:58 2016 -0800
+++ b/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java	Mon Feb 15 19:52:03 2016 -0800
@@ -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 @@
         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);