Changeset 288:adb48a12f33f for kraken-dom/src/main/java/org/krakenapps/dom/api/impl/FileUploadApiImpl.java

Timestamp:

09/04/11 21:33:41 (9 months ago)

Author:

delmitz

Branch:

default

Convert:

svn:7c3792e6-d75b-4784-96a6-b298f655ee64/trunk@2722

Message:

modified UploadedFile fileSpace to nullable.

File:

• kraken-dom/src/main/java/org/krakenapps/dom/api/impl/FileUploadApiImpl.java (modified) (3 diffs)

kraken-dom/src/main/java/org/krakenapps/dom/api/impl/FileUploadApiImpl.java

@@ -273 +273 @@
 
                 // build path
-                File spaceDir = new File(baseDir, Integer.toString(token.getSpaceId()));
+                File spaceDir = new File(baseDir, (token.getSpaceId() == null) ? "0" : Integer.toString(token.getSpaceId()));
                 spaceDir.mkdirs();
 
@@ -285 +285 @@
 
                 // save properties
-                FileSpace space = em.find(FileSpace.class, token.getSpaceId());
-                if (space == null) {
-                        String msg = String.format("kraken dom: file space [%d] not found for uploaded file [%s]",
-                                        token.getSpaceId(), token.getFileName());
-                        throw new IllegalStateException(msg);
+                FileSpace space = null;
+                if (token.getSpaceId() != null) {
+                        space = em.find(FileSpace.class, token.getSpaceId());
+                        if (space == null) {
+                                String msg = String.format("kraken dom: file space [%d] not found for uploaded file [%s]",
+                                                token.getSpaceId(), token.getFileName());
+                                throw new IllegalStateException(msg);
+                        }
                 }
 
@@ -381 +384 @@
 
                 // remove physical file
-                int spaceId = file.getFileSpace().getId();
+                int spaceId = (file.getFileSpace() == null) ? 0 : file.getFileSpace().getId();
                 File spaceDir = new File(baseDir, Integer.toString(spaceId));
                 spaceDir.mkdirs();