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

Merge r7709 from branches/nihvivo-rel-1.2-maint

Browse source
This commit is contained in:
ryounes 2011-03-29 20:13:47 +00:00
parent ce73492ad2
commit cb31463bb3
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/LinksDaoJena.java
View file

@ -74,7 +74,18 @@ public class LinksDaoJena extends JenaBaseDao implements LinksDao {
Collator collator = Collator.getInstance(); Collator collator = Collator.getInstance();
int compval = collator.compare(first.getDisplayRank(),second.getDisplayRank()); int compval = collator.compare(first.getDisplayRank(),second.getDisplayRank());
if (compval == 0) { if (compval == 0) {
compval = collator.compare(first.getAnchor(),second.getAnchor()); String firstAnchor = first.getAnchor();
String secondAnchor = second.getAnchor();
if (firstAnchor == null) {
if (secondAnchor == null) {
return 0;
}
return 1;
}
if (secondAnchor == null) {
return -1;
}
compval = collator.compare(firstAnchor, secondAnchor);
} }
return compval; return compval;
} }
@ -117,7 +128,18 @@ public class LinksDaoJena extends JenaBaseDao implements LinksDao {
Collator collator = Collator.getInstance(); Collator collator = Collator.getInstance();
int compval = collator.compare(first.getDisplayRank(),second.getDisplayRank()); int compval = collator.compare(first.getDisplayRank(),second.getDisplayRank());
if (compval == 0) { if (compval == 0) {
compval = collator.compare(first.getAnchor(),second.getAnchor()); String firstAnchor = first.getAnchor();
String secondAnchor = second.getAnchor();
if (firstAnchor == null) {
if (secondAnchor == null) {
return 0;
}
return 1;
}
if (secondAnchor == null) {
return -1;
}
compval = collator.compare(firstAnchor, secondAnchor);
} }
return compval; return compval;
} }