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.
Description of Changes
This change ensures that "wrapped" datasets created from
NetcdfDataset.enhance
or fromnetcdfDataset.toBuilder
can close the originalNetcdfDataset
if it was acquired from the cache. A new wrappedNetcdfDataset
cannot directly close the original in the cache whenclose
is called, but it can delegate this to theorigFile
. So theorigFile
needs to point to whatever the wrapped object is. This makes the behavior between enhancedNetcdfDatasets
andNetcdfFiles
the same.Add tests for this. Note before the fix tests two and four (
shouldReleaseLockOnNetcdfDatasetUsingBuilder
andshouldReleaseLockOnAggregation
) failed.Jenkins tests are passing on this branch: https://jenkins-aws.unidata.ucar.edu/view/Users/job/tara-netcdf-java/47/