Merge pull request #2 from jburel/omero_properties

Fix possible NPE
chris-allan · Mar 10, 2015 · ec9e652 · ec9e652
2 parents 648d1e2 + 2df2ee5
commit ec9e652
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/components/insight/SRC/org/openmicroscopy/shoola/agents/util/browser/TreeFileSet.java b/components/insight/SRC/org/openmicroscopy/shoola/agents/util/browser/TreeFileSet.java
@@ -30,6 +30,7 @@
 import org.openmicroscopy.shoola.agents.dataBrowser.DataBrowserAgent;
 import org.openmicroscopy.shoola.env.LookupNames;
 import org.openmicroscopy.shoola.env.config.Registry;
+import org.openmicroscopy.shoola.util.CommonsLangUtils;
 
 //Third-party libraries
 
@@ -79,8 +80,12 @@ private static String getTypeName(int type)
 
 		switch (type) {
 			case MOVIE: return "Movies";
-			case ORPHANED_IMAGES: 
-			    return (String) reg.lookup(LookupNames.ORPHANED_IMAGE_NAME);
+			case ORPHANED_IMAGES:
+			    String v = (String) reg.lookup(LookupNames.ORPHANED_IMAGE_NAME);
+			    if (CommonsLangUtils.isNotBlank(v)) {
+			        return v;
+			    }
+			    return "Orphaned Images";
 			case TAG:
 				return "Tags used not owned";
 			case OTHER: