Skip to content
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.

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

GEODE-5212: Fix TestUtil to return path #2281

Merged
merged 4 commits into from Aug 8, 2018

Conversation

sboorlagadda
Copy link
Member

When a classpath resource is looked up the path
retrieved from the resource URI can be null in which
case it creates a file from copying the resource. This
temp file path is already a good one to be returned.

Thank you for submitting a contribution to Apache Geode.

In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:

For all changes:

  • Is there a JIRA ticket associated with this PR? Is it referenced in the commit message?

  • Has your PR been rebased against the latest commit within the target branch (typically develop)?

  • Is your initial contribution a single, squashed commit?

  • Does gradlew build run cleanly?

  • Have you written or updated unit tests to verify your changes?

  • If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?

Note:

Please ensure that once the PR is submitted, you check travis-ci for build issues and
submit an update to your PR as soon as possible. If you need help, please send an
email to dev@geode.apache.org.

@@ -63,7 +63,7 @@ private static String getResourcePath(String name, URL resource) {
File tmpFile = File.createTempFile(filename, null);
tmpFile.deleteOnExit();
FileUtils.copyURLToFile(resource, tmpFile);
return compatibleWithWindows(tmpFile.getAbsolutePath());
return tmpFile.getAbsolutePath();
Copy link
Contributor

Choose a reason for hiding this comment

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

Just FYI, I found that Paths.get(URI) will return the correct path on both Windows and Unix (but throws an exception if the resource is jar:file:/... instead of file:/...). But in this piece of code it feels like there would need to be a bunch of nested exception blocks which would make it pretty ugly. However since this is just test code the method could also just throw an Exception. The upside would be that the compatibleWithWindows method would not be necessary any more.

@sboorlagadda sboorlagadda merged commit 931b5bb into apache:develop Aug 8, 2018
@sboorlagadda sboorlagadda deleted the debug-ssl-failures branch August 8, 2018 20:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants