Fix #3549: Load .tasty from jar if necessary #3550
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Array.empty | ||
| } | ||
| } | ||
| val tastyBytes = classfile match { |
There was a problem hiding this comment.
I propose something along the line of:
val tastyBytes = classfile.underlyingSource match {
case None =>
??? // virtual file?
case Some(jar: ZipArchive) => // We are in a jar
val jarArchive = JarArchive.open(File(jar.jpath))
val tastyFile = File(jarFile.jpath).resolve(classfile.name).changeExtension("tasty")
val bytes = readBytes(tastyFile)
jarArchive.close()
bytes
case _ =>
readBytes(File(classfile.jpath).changeExtension("tasty"))
}It's weird to pattern match on FileZipArchive#LeakyEntry. This is internal implementation detail, should probably be private.
There was a problem hiding this comment.
Also can you add a comment: // TODO: simplify when #3552 is fixed
There was a problem hiding this comment.
I have updated the code snippet: underlyingSource seems to return None only for virtual files. In the case there is no underlyingSource, we cannot do anything...
| if (attrLen == 0) { // A tasty attribute implies the existence of the .tasty file | ||
| def readBytes(file: io.Path): Array[Byte] = { | ||
| val plainFile = new PlainFile(file) | ||
| if (plainFile.exists) new AbstractFileReader(plainFile).nextBytes(plainFile.sizeOption.get) |
There was a problem hiding this comment.
There is toByteArray defined on AbstractFile
nicolasstucki
force-pushed
the
fix-loading-tasty-file-in-jar
branch
from
912ff90 to
f8cc80a
Compare
nicolasstucki
changed the title
nicolasstucki
force-pushed
the
fix-loading-tasty-file-in-jar
branch
from
f8cc80a to
df9a82d
Compare
nicolasstucki
force-pushed
the
fix-loading-tasty-file-in-jar
branch
from
df9a82d to
4774922
Compare
allanrenucci
approved these changes
Nov 27, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.