From f1ae5c6f017f5237c566ec59ccc0dbbc5dfba836 Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 29 Apr 2011 18:49:50 +0000
Subject: [PATCH] Merge r7914, r7921 from nihvivo-rel-1.2-maint

---
 .../webapp/controller/freemarker/UrlBuilder.java    |  2 +-
 .../CollatedObjectPropertyTemplateModel.java        | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
index d55915b45..3aaa8bd3f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
@@ -306,7 +306,7 @@ public class UrlBuilder {
             } else {
                 if (wadf.getApplicationDao().isExternallyLinkedNamespace(namespace)) {
                     log.debug("Found externally linked namespace " + namespace);
-                    profileUrl = namespace + "/" + localName;
+                    profileUrl = namespace + localName;
                 } else {
                     ParamMap params = new ParamMap("uri", individualUri);
                     profileUrl = getUrl("/individual", params);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
index 39ff93f82..042e3fc79 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
@@ -228,15 +228,12 @@ public class CollatedObjectPropertyTemplateModel extends ObjectPropertyTemplateM
     }
     
     private String getSubclassName(String subclassUri, VitroRequest vreq) {
-        String subclassName = null;
         if (subclassUri.isEmpty()) {
-            subclassName = "";
-        } else {
-            VClassDao vclassDao = vreq.getWebappDaoFactory().getVClassDao();
-            VClass vclass = vclassDao.getVClassByURI(subclassUri);
-            subclassName = vclass.getName();
-        }
-        return subclassName;
+           return "";
+        }         
+        VClassDao vclassDao = vreq.getWebappDaoFactory().getVClassDao();
+        VClass vclass = vclassDao.getVClassByURI(subclassUri);
+        return vclass != null ? vclass.getName() : "";
     }
     
     /* Access methods for templates */