diff --git a/src/main/java/cokr/xit/base/file/FileInfo.java b/src/main/java/cokr/xit/base/file/FileInfo.java index 32ab267..5d3fc25 100644 --- a/src/main/java/cokr/xit/base/file/FileInfo.java +++ b/src/main/java/cokr/xit/base/file/FileInfo.java @@ -98,8 +98,12 @@ public class FileInfo extends AbstractEntity { * @param fileInfo FileInfo */ public void setInfo(FileInfo fileInfo) { + fileInfo.setInfoType(infoType); + fileInfo.setInfoKey(infoKey); +/* fileInfo.setInfoType(Assert.notEmpty(infoType, "infoType")); fileInfo.setInfoKey(Assert.notEmpty(infoKey, "infoKey")); +*/ fileInfo.setSubType(subType); } } @@ -190,7 +194,8 @@ public class FileInfo extends AbstractEntity { if (file == null) continue; FileInfo info = new FileInfo(); - relation.setInfo(info); + if (relation != null) + relation.setInfo(info); String filename = file.getName(); info.setName(filename); InputStream input = new FileInputStream(file); @@ -240,7 +245,9 @@ public class FileInfo extends AbstractEntity { if (holder == null) continue; FileInfo info = new FileInfo(); - holder.getRelation().setInfo(info); + Relation relation = holder.getRelation(); + if (relation != null) + relation.setInfo(info); String filename = holder.getFilename(); info.setName(filename); InputStream input = new ByteArrayInputStream(holder.data); diff --git a/src/main/java/cokr/xit/base/file/web/FileInfoFactory.java b/src/main/java/cokr/xit/base/file/web/FileInfoFactory.java index 368b311..83c4267 100644 --- a/src/main/java/cokr/xit/base/file/web/FileInfoFactory.java +++ b/src/main/java/cokr/xit/base/file/web/FileInfoFactory.java @@ -33,7 +33,8 @@ public class FileInfoFactory extends FileInfo.Factory { info.setSize(file.getSize()); info.setInputStream(file.getInputStream()); info.setSortOrder(result.size()); - relation.setInfo(info); + if (relation != null) + relation.setInfo(info); result.add(info); } catch (Exception e) { throw runtimeException(e);