From cb31463bb32fae8cd05349fa4559f144e80709f1 Mon Sep 17 00:00:00 2001 From: ryounes Date: Tue, 29 Mar 2011 20:13:47 +0000 Subject: [PATCH] Merge r7709 from branches/nihvivo-rel-1.2-maint --- .../vitro/webapp/dao/jena/LinksDaoJena.java | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/LinksDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/LinksDaoJena.java index 8d7dc7670..0425d3b9d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/LinksDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/LinksDaoJena.java @@ -74,7 +74,18 @@ public class LinksDaoJena extends JenaBaseDao implements LinksDao { Collator collator = Collator.getInstance(); int compval = collator.compare(first.getDisplayRank(),second.getDisplayRank()); 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; } @@ -117,7 +128,18 @@ public class LinksDaoJena extends JenaBaseDao implements LinksDao { Collator collator = Collator.getInstance(); int compval = collator.compare(first.getDisplayRank(),second.getDisplayRank()); 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; }