litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TestFileController.java: fixed a "d'oh!"

Browse source
This commit is contained in:
mbarbier 2011-04-28 18:47:48 +00:00
parent e6af4d58b5
commit 4bd69801ce
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/edu/cornell/mannlib/vitro/webapp/controller/harvester/TestFileController.java
View file

@ -203,7 +203,6 @@ public class TestFileController extends FreemarkerHttpServlet {
* the file name prior to the final "." symbol (if one exists). * the file name prior to the final "." symbol (if one exists).
*/ */
private String handleNameCollision(String filename, File directory) { private String handleNameCollision(String filename, File directory) {
String path = directory.getPath();
String base = filename; String base = filename;
String extension = ""; String extension = "";
if(filename.contains(".")) { if(filename.contains(".")) {
@ -213,7 +212,7 @@ public class TestFileController extends FreemarkerHttpServlet {
String renamed = filename; String renamed = filename;
for(int i = 1; new File(path + renamed).exists(); i++) { for(int i = 1; new File(directory, renamed).exists(); i++) {
renamed = base + " (" + String.valueOf(i) + ")" + extension; renamed = base + " (" + String.valueOf(i) + ")" + extension;
} }