Author: tdraier
Date: Tue May 22 16:27:13 2007
New Revision: 17346
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17346&repname=
=3Djahia
Log:
check that files are correctly uploaded to avoid npe ( DOC-201 - Exception =
raised when not enough space on disk to unzip archive in file manager )
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/filemanage=
r/DAVFilemanager_Engine.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/file=
manager/DAVFilemanager_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/filemanager/DAVFilemanager_Engine.j=
ava&rev=3D17346&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/filemanage=
r/DAVFilemanager_Engine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/filemanage=
r/DAVFilemanager_Engine.java Tue May 22 16:27:13 2007
@@ -1134,6 +1134,9 @@
=
// get file names
final Set filesNames =3D fupload.getFileNames();
+ if (filesNames =3D=3D null) {
+ return null;
+ }
=
final Iterator iterator =3D filesNames.iterator();
// For each of the files, upload it and rename it if there is =
an existing file
@@ -1195,6 +1198,9 @@
=
// get files name
final Set filesName =3D fupload.getFileNames();
+ if (filesName =3D=3D null) {
+ return false;
+ }
=
final Vector existingFiles =3D new Vector();
final Vector canOverwrite =3D new Vector();
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
