Changeset 5762

Timestamp:

Sep 26, 2011, 3:01:18 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

References #1604: Support for multiple files of the same type in a FileSet?

Fixed a NullPointerException? when removing the only file of a given file type from a file set.

File:

• trunk/src/core/net/sf/basedb/core/FileSet.java (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/FileSet.java

@@ -556 +556 @@
     DbControl dc = getDbControl();
     int typeId = type.getId();
-    int fileId = file.getId();
+    int fileId = file == null ? 0 : file.getId();
     FileSetMember remain = null;
     Iterator<FileSetMemberData> it = getData().getMembers().iterator();