Changeset 4457

Timestamp:

Mar 20, 2013, 1:36:40 PM (10 years ago)

Author:

olle

Message:

Refs #283. Refs #339. Classes/files action/sample/CreateSampleFile.java, action/extract/CreateExtractFile.java, and action/extract/CreateLabeledExtractFile.java in client/servlet/ updated to check if file list equals null before calling its isEmpty() method.

Location:

trunk/client/servlet/src/org/proteios/action

Files:

• extract/CreateExtractFile.java (modified) (1 diff)
• extract/CreateLabeledExtractFile.java (modified) (1 diff)
• sample/CreateSampleFile.java (modified) (1 diff)

trunk/client/servlet/src/org/proteios/action/extract/CreateExtractFile.java

@@ -63 +63 @@
     List<Integer> files = getValidIntegerList(FormFactory.VID);
     Integer bmId = getSessionAttribute(ViewActiveExtract.VEXTRACTID);
-    if (files.isEmpty())
+    if (files == null || files.isEmpty())
       throw new InvalidParameterException(
         "Please select at least one file to use for annotation");

trunk/client/servlet/src/org/proteios/action/extract/CreateLabeledExtractFile.java

@@ -63 +63 @@
     List<Integer> files = getValidIntegerList(FormFactory.VID);
     Integer bmId = getSessionAttribute(ViewActiveLabeledExtract.VLABELEDEXTRACTID);
-    if (files.isEmpty())
+    if (files == null || files.isEmpty())
       throw new InvalidParameterException(
         "Please select at least one file to use for annotation");

trunk/client/servlet/src/org/proteios/action/sample/CreateSampleFile.java

@@ -39 +39 @@
     List<Integer> files = getValidIntegerList(FormFactory.VID);
     Integer bmId = getSessionAttribute(ViewActiveSample.VSAMPLEID);
-    if (files.isEmpty())
+    if (files == null || files.isEmpty())
       throw new InvalidParameterException(
         "Please select at least one file to use for annotation");