diff --git a/src/zall/UploadServlet.java b/src/zall/UploadServlet.java index e3e1731..e814c4c 100644 --- a/src/zall/UploadServlet.java +++ b/src/zall/UploadServlet.java @@ -30,8 +30,9 @@ public class UploadServlet extends AjaxFileUpload{ private static final Logger logger = LogUtil.getLogger(); private static final long serialVersionUID = 1L; - private static final Set VIDEO_EXT = Collections.unmodifiableSet(new HashSet(Arrays.asList( - "avi","mp4","mpeg","mpeg","divx","xvid","wmv","mov","flv","m4v"))); + public static final Set VIDEO_EXT = Collections.unmodifiableSet(new HashSet(Arrays.asList(new String[]{ + "avi","mp4","mpeg","mpeg","divx","xvid","wmv","mov","flv","m4v" + }))); @Override public String getProgressHTML() { @@ -75,7 +76,6 @@ public class UploadServlet extends AjaxFileUpload{ vid.setUser( user ); vid.setFile( item ); vid.save(db); - logger.info("Video upload successful: "+vid.getFolder().getPath()); } else{ Image img = new Image(); @@ -83,8 +83,7 @@ public class UploadServlet extends AjaxFileUpload{ img.setFolder( folder ); img.setUser( user ); img.setFile( item ); - img.save(db); - logger.info("Image upload successful: "+img.getFolder().getPath()); + img.save(db); } } catch (Exception e) { logger.log(Level.WARNING, "Error: Creating new Media(\""+item.getName()+"\")", e); diff --git a/src/zall/bean/Folder.java b/src/zall/bean/Folder.java index 6f4cc36..a7921ea 100755 --- a/src/zall/bean/Folder.java +++ b/src/zall/bean/Folder.java @@ -145,7 +145,7 @@ public class Folder extends DBBean{ return null; } - if( user < 0 || filename == null ) + if( user >= 0 || filename == null ) return null; StringBuilder tmp = new StringBuilder();