Skip to content

Commit

Permalink
8286444: javac errors after JDK-8251329 are not helpful enough to fin…
Browse files Browse the repository at this point in the history
…d root cause

Reviewed-by: mdoerr
  • Loading branch information
RealCLanger committed May 14, 2022
1 parent 9eb15c9 commit 29c4b8e
Showing 1 changed file with 7 additions and 2 deletions.
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2022, 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
Expand Down Expand Up @@ -63,6 +63,7 @@
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.zip.ZipException;

import javax.lang.model.SourceVersion;
import javax.tools.FileObject;
Expand Down Expand Up @@ -560,7 +561,11 @@ public ArchiveContainer(Path archivePath) throws IOException, ProviderNotFoundEx
Map<String,String> env = Collections.singletonMap("multi-release", multiReleaseValue);
FileSystemProvider jarFSProvider = fsInfo.getJarFSProvider();
Assert.checkNonNull(jarFSProvider, "should have been caught before!");
this.fileSystem = jarFSProvider.newFileSystem(archivePath, env);
try {
this.fileSystem = jarFSProvider.newFileSystem(archivePath, env);
} catch (ZipException ze) {
throw new IOException("ZipException opening \"" + archivePath + "\": " + ze.getMessage(), ze);
}
} else {
this.fileSystem = FileSystems.newFileSystem(archivePath, (ClassLoader)null);
}
Expand Down

7 comments on commit 29c4b8e

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RealCLanger
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk18u

@openjdk
Copy link

@openjdk openjdk bot commented on 29c4b8e May 30, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RealCLanger the backport was successfully created on the branch RealCLanger-backport-29c4b8e8 in my personal fork of openjdk/jdk18u. To create a pull request with this backport targeting openjdk/jdk18u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 29c4b8e8 from the openjdk/jdk repository.

The commit being backported was authored by Christoph Langer on 14 May 2022 and was reviewed by Martin Doerr.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk18u:

$ git fetch https://github.com/openjdk-bots/jdk18u RealCLanger-backport-29c4b8e8:RealCLanger-backport-29c4b8e8
$ git checkout RealCLanger-backport-29c4b8e8
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk18u RealCLanger-backport-29c4b8e8

@RealCLanger
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 29c4b8e May 30, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RealCLanger the backport was successfully created on the branch RealCLanger-backport-29c4b8e8 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 29c4b8e8 from the openjdk/jdk repository.

The commit being backported was authored by Christoph Langer on 14 May 2022 and was reviewed by Martin Doerr.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev RealCLanger-backport-29c4b8e8:RealCLanger-backport-29c4b8e8
$ git checkout RealCLanger-backport-29c4b8e8
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev RealCLanger-backport-29c4b8e8

@RealCLanger
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 29c4b8e May 30, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RealCLanger Could not automatically backport 29c4b8e8 to openjdk/jdk11u-dev due to conflicts in the following files:

  • src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java

To manually resolve these conflicts run the following commands in your personal fork of openjdk/jdk11u-dev:

$ git checkout -b RealCLanger-backport-29c4b8e8
$ git fetch --no-tags https://git.openjdk.java.net/jdk 29c4b8e80d1860249a79cfd1941354150468fc5b
$ git cherry-pick --no-commit 29c4b8e80d1860249a79cfd1941354150468fc5b
$ # Resolve conflicts
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 29c4b8e80d1860249a79cfd1941354150468fc5b'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport 29c4b8e80d1860249a79cfd1941354150468fc5b.

Please sign in to comment.