Skip to content

Conversation

@jrshust
Copy link
Contributor

@jrshust jrshust commented May 20, 2017

What changes were proposed in this pull request?

  • Add a null check to RPackageUtils#checkManifestForR so that jars w/o manifests don't NPE.

How was this patch tested?

  • Unit tests and manual tests.

@felixcheung
Copy link
Member

Jenkins, ok to test

@SparkQA
Copy link

SparkQA commented May 20, 2017

Test build #77128 has finished for PR 18040 at commit 5951b33.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

}
mani
mani
} else null
Copy link
Member

Choose a reason for hiding this comment

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

I think typically Spark style is to have the else statement in separate line enclosed with {} like

} else {
   null
}

val jarStream = new JarOutputStream(jarFileStream, manifest)
val jarStream = if (manifest != null) {
new JarOutputStream(jarFileStream, manifest)
} else new JarOutputStream(jarFileStream)
Copy link
Member

Choose a reason for hiding this comment

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

ditto here with else

@felixcheung
Copy link
Member

@jrshust would you have a chance to address a few minor comments?

@jrshust
Copy link
Contributor Author

jrshust commented May 22, 2017

@felixcheung yep sorry will address today!

@SparkQA
Copy link

SparkQA commented May 22, 2017

Test build #77195 has started for PR 18040 at commit 7ac474a.

@felixcheung
Copy link
Member

hmm that's odd

Build was aborted
Aborted by anonymous
ERROR: Step ?Archive the artifacts? failed: no workspace for SparkPullRequestBuilder #77195
ERROR: Step ?Publish JUnit test result report? failed: no workspace for SparkPullRequestBuilder #77195
Test FAILed.

@jrshust
Copy link
Contributor Author

jrshust commented May 22, 2017

Yeah I'm a bit confused the last build was fine and this one just had style changes. What are the next steps here? Is that a red herring or was it actually aborted?

@felixcheung
Copy link
Member

Jenkins, retest this please

@felixcheung
Copy link
Member

it looks like build jobs are killed, let's try again

@SparkQA
Copy link

SparkQA commented May 23, 2017

Test build #77205 has finished for PR 18040 at commit 7ac474a.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

asfgit pushed a commit that referenced this pull request May 23, 2017
…festForR

## What changes were proposed in this pull request?

- Add a null check to RPackageUtils#checkManifestForR so that jars w/o manifests don't NPE.

## How was this patch tested?

- Unit tests and manual tests.

Author: James Shuster <[email protected]>

Closes #18040 from jrshust/feature/r-package-utils.

(cherry picked from commit 4dbb63f)
Signed-off-by: Felix Cheung <[email protected]>
Copy link
Member

@felixcheung felixcheung left a comment

Choose a reason for hiding this comment

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

LGTM

@felixcheung
Copy link
Member

merged to master/2.2, thanks!

@asfgit asfgit closed this in 4dbb63f May 23, 2017
liyichao pushed a commit to liyichao/spark that referenced this pull request May 24, 2017
…festForR

## What changes were proposed in this pull request?

- Add a null check to RPackageUtils#checkManifestForR so that jars w/o manifests don't NPE.

## How was this patch tested?

- Unit tests and manual tests.

Author: James Shuster <[email protected]>

Closes apache#18040 from jrshust/feature/r-package-utils.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants