Commits

Tim Olsen committed 8311f3e Merge

Merge bug fixes

Comments (0)

Files changed (2)

plugin-resources/webapp/xnat/java/org/nrg/xnat/restlet/resources/SecureResource.java

 				item= populater.getItem();
 			
 		} catch (XFTInitException e) {
-			e.printStackTrace();
+			logger.error("",e);
 		} catch (ElementNotFoundException e) {
-			e.printStackTrace();
+			logger.error("",e);
 		} catch (FieldNotFoundException e) {
-			e.printStackTrace();
+			logger.error("",e);
 		}
 		return item;
 	}

plugin-resources/webapp/xnat/java/org/nrg/xnat/restlet/resources/UserCacheResource.java

         columns.add("URI");
         XFTTable table=new XFTTable();
         table.initTable(columns);
+        if(fileArray!=null){
         for (File f : fileArray) {
         	String fn=f.getName();
         	Object[] oarray = new Object[] { fn, constructURI(fn) };
         	table.insertRow(oarray);
         }
+        }
         
         sendTableRepresentation(table,true);