litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue/VIVO 3739 : fix for data property editing form (#323)

Browse source 
* fix: compare blank node id with uri safely
This commit is contained in:
Georgy Litvinov 2022-08-19 14:13:06 +02:00 • committed by GitHub
parent ce680d9cd7
commit f8c38b8233
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java
View file

@ -643,7 +643,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
if (existingValue == null ) { if (existingValue == null ) {
model.add(res, prop, model.createResource(uri)); model.add(res, prop, model.createResource(uri));
} else if (!(existingValue.getURI()).equals(uri)) { } else if (!isEqual(uri, existingValue)) {
model.removeAll(res, prop, null); model.removeAll(res, prop, null);
model.add(res, prop, model.createResource(uri)); model.add(res, prop, model.createResource(uri));
} }
@ -651,6 +651,15 @@ public class JenaBaseDao extends JenaBaseDaoCon {
} }
} }
private boolean isEqual(String uri, Resource existingValue) {
if (existingValue.asNode().isBlank()) {
final String blankNodeId = existingValue.asNode().getBlankNodeId().toString();
return uri.endsWith(blankNodeId);
} else {
return existingValue.getURI().equals(uri);
}
}
/** /**
* convenience method for use with functional object properties * convenience method for use with functional object properties
*/ */