[Nmrshiftdb-devel] CVS: nmrshiftdb/src/java/org/openscience/nmrshiftdb/daemons AssignRobotDaemon.j
Brought to you by:
steinbeck
|
From: Stefan K. <sh...@us...> - 2006-09-22 15:44:58
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/daemons In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23708/src/java/org/openscience/nmrshiftdb/daemons Modified Files: AssignRobotDaemon.java Log Message: avoids npe (hopefully) Index: AssignRobotDaemon.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/daemons/AssignRobotDaemon.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** AssignRobotDaemon.java 22 Sep 2006 10:56:34 -0000 1.5 --- AssignRobotDaemon.java 22 Sep 2006 15:44:55 -0000 1.6 *************** *** 64,84 **** private void searchfiles(File tolookin, String usersid, ZipOutputStream zipoutputstream, StringBuffer attachedfiles, File dirtoignore) throws IOException{ File[] filesindir=tolookin.listFiles(); ! for(int i=0;i<filesindir.length;i++){ ! if(filesindir[i].isDirectory() && filesindir[i].getName().indexOf(usersid)!=0 && !filesindir[i].getName().equals(".") && !filesindir[i].getName().equals("..") && !filesindir[i].equals(dirtoignore)){ ! searchfiles(filesindir[i],usersid,zipoutputstream,attachedfiles, dirtoignore); ! }else if(filesindir[i].isDirectory() && filesindir[i].getName().indexOf(usersid)==0){ ! addfiles(filesindir[i], zipoutputstream, attachedfiles); ! }else{ ! if(filesindir[i].getName().indexOf(usersid)==0){ ! zipoutputstream.putNextEntry(new ZipEntry(filesindir[i].getName())); ! FileInputStream fis=new FileInputStream(filesindir[i]); ! int read=0; ! while((read=fis.read())!=-1){ ! zipoutputstream.write(read); ! } ! attachedfiles.append(filesindir[i]+"; "); ! zipoutputstream.closeEntry(); ! } ! } } } --- 64,86 ---- private void searchfiles(File tolookin, String usersid, ZipOutputStream zipoutputstream, StringBuffer attachedfiles, File dirtoignore) throws IOException{ File[] filesindir=tolookin.listFiles(); ! if(filesindir!=null){ ! for(int i=0;i<filesindir.length;i++){ ! if(filesindir[i].isDirectory() && filesindir[i].getName().indexOf(usersid)!=0 && !filesindir[i].getName().equals(".") && !filesindir[i].getName().equals("..") && !filesindir[i].equals(dirtoignore)){ ! searchfiles(filesindir[i],usersid,zipoutputstream,attachedfiles, dirtoignore); ! }else if(filesindir[i].isDirectory() && filesindir[i].getName().indexOf(usersid)==0){ ! addfiles(filesindir[i], zipoutputstream, attachedfiles); ! }else{ ! if(filesindir[i].getName().indexOf(usersid)==0){ ! zipoutputstream.putNextEntry(new ZipEntry(filesindir[i].getName())); ! FileInputStream fis=new FileInputStream(filesindir[i]); ! int read=0; ! while((read=fis.read())!=-1){ ! zipoutputstream.write(read); ! } ! attachedfiles.append(filesindir[i]+"; "); ! zipoutputstream.closeEntry(); ! } ! } ! } } } *************** *** 86,102 **** private void addfiles(File toadd, ZipOutputStream zipoutputstream, StringBuffer attachedfiles) throws IOException{ File[] filesindir=toadd.listFiles(); ! for(int i=0;i<filesindir.length;i++){ ! if(filesindir[i].isDirectory() && !filesindir[i].getName().equals(".") && !filesindir[i].getName().equals("..")){ ! addfiles(filesindir[i],zipoutputstream,attachedfiles); ! }else{ ! zipoutputstream.putNextEntry(new ZipEntry(toadd.getName()+"/"+filesindir[i].getName())); ! FileInputStream fis=new FileInputStream(filesindir[i]); ! int read=0; ! while((read=fis.read())!=-1){ ! zipoutputstream.write(read); ! } ! attachedfiles.append(filesindir[i]+"; "); ! zipoutputstream.closeEntry(); ! } } } --- 88,106 ---- private void addfiles(File toadd, ZipOutputStream zipoutputstream, StringBuffer attachedfiles) throws IOException{ File[] filesindir=toadd.listFiles(); ! if(filesindir!=null){ ! for(int i=0;i<filesindir.length;i++){ ! if(filesindir[i].isDirectory() && !filesindir[i].getName().equals(".") && !filesindir[i].getName().equals("..")){ ! addfiles(filesindir[i],zipoutputstream,attachedfiles); ! }else if(filesindir[i].isFile()){ ! zipoutputstream.putNextEntry(new ZipEntry(toadd.getName()+"/"+filesindir[i].getName())); ! FileInputStream fis=new FileInputStream(filesindir[i]); ! int read=0; ! while((read=fis.read())!=-1){ ! zipoutputstream.write(read); ! } ! attachedfiles.append(filesindir[i]+"; "); ! zipoutputstream.closeEntry(); ! } ! } } } |