Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominic.Guss2018-10-15 17:49:08 +0000
committerDominic Guss2018-10-16 16:24:07 +0000
commit9ce9317c54f95eb3efcd1ab3aadb5741c779519c (patch)
treeff1f15792fb2c5c20af885361bc219ef479117d7
parent22037049d97f37e2c8ab90942c749283b760f25f (diff)
downloadorg.eclipse.osee-9ce9317c54f95eb3efcd1ab3aadb5741c779519c.tar.gz
org.eclipse.osee-9ce9317c54f95eb3efcd1ab3aadb5741c779519c.tar.xz
org.eclipse.osee-9ce9317c54f95eb3efcd1ab3aadb5741c779519c.zip
bug[ats_TW11447]: Dispo returns 500 error when dispositioning at least one test point
Change-Id: I0a848964c844b4de07797fd70fdf84a74bf35f35 Signed-off-by: Dominic.Guss <Dominic.Guss@boeing.com>
-rw-r--r--plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoStrings.java2
-rw-r--r--plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoConnector.java20
-rw-r--r--plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/types/OseeTypes_Dispo.osee1
3 files changed, 13 insertions, 10 deletions
diff --git a/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoStrings.java b/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoStrings.java
index de07946094..00afb07175 100644
--- a/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoStrings.java
+++ b/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoStrings.java
@@ -43,7 +43,7 @@ public class DispoStrings {
public static final String Item_Pass = "PASS";
public static final String Item_Complete = "COMPLETE";
public static final String Item_InComplete = "INCOMPLETE";
- public static final String Item_Analyzed = "ANALYZED";
+ public static final String Item_Analyzed = "COMPLETE-ANALYZED";
public static final String Operation_Import = "Import";
public static final String Operation_MassSendStatus = "MassSendDispoItemStatus";
diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoConnector.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoConnector.java
index f58df80157..ef0d231510 100644
--- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoConnector.java
+++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoConnector.java
@@ -90,15 +90,17 @@ public class DispoConnector {
}
private void parseThroughAnnotations(Collection<DispoAnnotationData> annotations, Collection<DispoAnnotationData> defaultAnnotations, Collection<DispoAnnotationData> invalidAnnotations, Collection<DispoAnnotationData> analyzeAnnotations) {
- for (DispoAnnotationData annotation : annotations) {
- if (annotation.getIsDefault()) {
- defaultAnnotations.add(annotation);
- }
- if (!annotation.isValid()) {
- invalidAnnotations.add(annotation);
- }
- if (annotation.getIsAnalyze()) {
- analyzeAnnotations.add(annotation);
+ if (annotations != null) {
+ for (DispoAnnotationData annotation : annotations) {
+ if (annotation.getIsDefault()) {
+ defaultAnnotations.add(annotation);
+ }
+ if (!annotation.isValid()) {
+ invalidAnnotations.add(annotation);
+ }
+ if (annotation.getIsAnalyze()) {
+ analyzeAnnotations.add(annotation);
+ }
}
}
}
diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/types/OseeTypes_Dispo.osee b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/types/OseeTypes_Dispo.osee
index 9c7bef9c76..0fed42f79d 100644
--- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/types/OseeTypes_Dispo.osee
+++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/types/OseeTypes_Dispo.osee
@@ -273,6 +273,7 @@ oseeEnumType "enum.dispo.item status" {
entry "PASS"
entry "INCOMPLETE"
entry "COMPLETE"
+ entry "COMPLETE-ANALYZED"
entry "Unspecified"
}

Back to the top