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

fix problem causing deadlock while copying features between the same shapefile layer #261

Merged
merged 1 commit into from
Jan 9, 2018

Conversation

nprigour
Copy link
Contributor

@nprigour nprigour commented Jan 7, 2018

fix for problem described in issue #260.

It seems that corresponding feature iterator was never closed for the copied feature collection and the maintained read locks caused problem when trying a write lock was attempted during commit time.

Signed-off-by: Nikolaos Pringouris nprigour@gmail.com

same shapefile layer

Signed-off-by: Nikolaos Pringouris <nprigour@gmail.com>
@nprigour
Copy link
Contributor Author

nprigour commented Jan 8, 2018

The present pull request seems to address also the following locationtech bug

@fgdrf
Copy link
Contributor

fgdrf commented Jan 9, 2018

Thanks for providing this patch! Going to test copy & paste within the same layer today ..

@fgdrf fgdrf self-requested a review January 9, 2018 05:12
@fgdrf fgdrf added this to the uDig-2.0.0 milestone Jan 9, 2018
@@ -285,7 +288,7 @@ private Query createQuery( ILayer sourceLayer, Filter filter, Layer targetLayer,

queryAttributes.putAll(FeatureUtils.createAttributeMapping(sourceSchema, targetSchema));
Set<String> properties = new HashSet(queryAttributes.values());
return new DefaultQuery(sourceSchema.getName().getLocalPart(), filter, properties
return new Query(sourceSchema.getName().getLocalPart(), filter, properties
Copy link
Contributor

Choose a reason for hiding this comment

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

It the switch from DefaultQuery to Query related to the bugfix or just a cleanup here?

Copy link
Contributor Author

@nprigour nprigour Jan 9, 2018

Choose a reason for hiding this comment

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

Just cleanup since DefaultQuery has been marked as deprecated and synonymous to plain Query class

Copy link
Contributor

Choose a reason for hiding this comment

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

Tested context menu in map panel with right mouse -> copy (of selected feature) and pased it on map ✔️
tested also to copy more than one feature ✔️
copy in map-panel and paste onto layer works as expected ✔️

Thanks again for fixing this issue!

@fgdrf fgdrf merged commit acd64a3 into locationtech:master Jan 9, 2018
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.

None yet

2 participants