Compare commits

..

No commits in common. "master" and "BUILD-66" have entirely different histories.

2 changed files with 6 additions and 13 deletions

View file

@ -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<String> VIDEO_EXT = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(
"avi","mp4","mpeg","mpeg","divx","xvid","wmv","mov","flv","m4v")));
public static final Set<String> VIDEO_EXT = Collections.unmodifiableSet(new HashSet<String>(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();
@ -84,7 +84,6 @@ public class UploadServlet extends AjaxFileUpload{
img.setUser( user );
img.setFile( item );
img.save(db);
logger.info("Image upload successful: "+img.getFolder().getPath());
}
} catch (Exception e) {
logger.log(Level.WARNING, "Error: Creating new Media(\""+item.getName()+"\")", e);

View file

@ -24,11 +24,10 @@ public class Folder extends DBBean{
private static final Logger logger = LogUtil.getLogger();
private transient String name;
protected long user = -1;
protected Long user;
protected transient User userInstance;
private String path;
protected Folder parent;
protected Timestamp date;
private boolean isPrivate;
@ -68,7 +67,6 @@ public class Folder extends DBBean{
}
public Folder(){
date = new Timestamp( System.currentTimeMillis() );
}
public String getName(){
@ -127,10 +125,6 @@ public class Folder extends DBBean{
return parent;
}
public Timestamp getDate(){
return date;
}
/**
* @param filename is the name of the file
@ -145,7 +139,7 @@ public class Folder extends DBBean{
return null;
}
if( user < 0 || filename == null )
if( user == null || filename == null )
return null;
StringBuilder tmp = new StringBuilder();