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

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
brianjlowe 2013-11-07 12:50:52 -05:00
commit a675abec2a
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java
View file

@ -607,7 +607,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
if (existingRanges[1] == null) { if (existingRanges[1] == null) {
existingRanges[1] = ranges[1]; existingRanges[1] = ranges[1];
} }
if (moreSpecificThan(ranges[0], existingRanges[0])) { if (ranges[0] != null && moreSpecificThan(ranges[0], existingRanges[0])) {
existingRanges[0] = ranges[0]; existingRanges[0] = ranges[0];
} }
map.put(propURI, existingRanges); map.put(propURI, existingRanges);