Skip to content

[SPARK-20815] [SPARKR] NullPointerException in RPackageUtils#checkManifestForR #18040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

[SPARK-20815] [SPARKR] NullPointerException in RPackageUtils#checkManifestForR #18040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b5bde8
Add null check
jrshust May 20, 2017
5951b33
Add test case
jrshust May 20, 2017
7ac474a
Address code style feedback
jrshust May 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions core/src/main/scala/org/apache/spark/deploy/RPackageUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ private[deploy] object RPackageUtils extends Logging {
* Exposed for testing.
*/
private[deploy] def checkManifestForR(jar: JarFile): Boolean = {
if (jar.getManifest == null) {
return false
}
val manifest = jar.getManifest.getMainAttributes
manifest.getValue(hasRPackage) != null && manifest.getValue(hasRPackage).trim == "true"
}
Expand Down
14 changes: 10 additions & 4 deletions core/src/test/scala/org/apache/spark/deploy/IvyTestUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,16 +243,22 @@ private[deploy] object IvyTestUtils {
withManifest: Option[Manifest] = None): File = {
val jarFile = new File(dir, artifactName(artifact, useIvyLayout))
val jarFileStream = new FileOutputStream(jarFile)
val manifest = withManifest.getOrElse {
val mani = new Manifest()
val manifest: Manifest = withManifest.getOrElse {
if (withR) {
val mani = new Manifest()
val attr = mani.getMainAttributes
attr.put(Name.MANIFEST_VERSION, "1.0")
attr.put(new Name("Spark-HasRPackage"), "true")
mani
} else {
null
}
mani
}
val jarStream = new JarOutputStream(jarFileStream, manifest)
val jarStream = if (manifest != null) {
new JarOutputStream(jarFileStream, manifest)
} else {
new JarOutputStream(jarFileStream)
}

for (file <- files) {
val jarEntry = new JarEntry(file._1)
Expand Down
10 changes: 10 additions & 0 deletions core/src/test/scala/org/apache/spark/deploy/RPackageUtilsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,16 @@ class RPackageUtilsSuite
}
}

test("jars without manifest return false") {
IvyTestUtils.withRepository(main, None, None) { repo =>
val jar = IvyTestUtils.packJar(new File(new URI(repo)), dep1, Nil,
useIvyLayout = false, withR = false, None)
val jarFile = new JarFile(jar)
assert(jarFile.getManifest == null, "jar file should have null manifest")
assert(!RPackageUtils.checkManifestForR(jarFile), "null manifest should return false")
}
}

test("SparkR zipping works properly") {
val tempDir = Files.createTempDir()
Utils.tryWithSafeFinally {
Expand Down