more NPE fixes
This commit is contained in:
parent
4d7591c85f
commit
d0917c78df
|
@ -88,7 +88,7 @@ public class FFHIRPathHostServices implements FHIRPathEngine.IEvaluationContext
|
||||||
return noErrorValidationMessages(valerrors);
|
return noErrorValidationMessages(valerrors);
|
||||||
}
|
}
|
||||||
if (item instanceof Element) {
|
if (item instanceof Element) {
|
||||||
val.validate(appContext, valerrors, (Element) item, url);
|
val.validate(appContext, valerrors, null, (Element) item, url);
|
||||||
return noErrorValidationMessages(valerrors);
|
return noErrorValidationMessages(valerrors);
|
||||||
}
|
}
|
||||||
throw new NotImplementedException("Not done yet (FFHIRPathHostServices.conformsToProfile), when item is not element or not resource");
|
throw new NotImplementedException("Not done yet (FFHIRPathHostServices.conformsToProfile), when item is not element or not resource");
|
||||||
|
|
|
@ -649,11 +649,13 @@ public class Utilities {
|
||||||
StringBuilder s = new StringBuilder();
|
StringBuilder s = new StringBuilder();
|
||||||
boolean d = false;
|
boolean d = false;
|
||||||
for (String arg : args) {
|
for (String arg : args) {
|
||||||
if (!d)
|
if (args != null) {
|
||||||
d = !noString(arg);
|
if (!d)
|
||||||
else if (!s.toString().endsWith("/") && !arg.startsWith("/"))
|
d = !noString(arg);
|
||||||
s.append("/");
|
else if (s.toString() != null && !s.toString().endsWith("/") && !arg.startsWith("/"))
|
||||||
s.append(arg);
|
s.append("/");
|
||||||
|
s.append(arg);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return s.toString();
|
return s.toString();
|
||||||
}
|
}
|
||||||
|
|
|
@ -224,7 +224,7 @@ Validation_VAL_Profile_NoSnapshot = StructureDefinition has no snapshot - valida
|
||||||
Validation_VAL_Profile_NoType = The type of element {0} is not known, which is illegal. Valid types at this point are {1}
|
Validation_VAL_Profile_NoType = The type of element {0} is not known, which is illegal. Valid types at this point are {1}
|
||||||
Validation_VAL_Profile_NotAllowed = This element is not allowed by the profile {0}
|
Validation_VAL_Profile_NotAllowed = This element is not allowed by the profile {0}
|
||||||
Validation_VAL_Profile_NotSlice = This element does not match any known slice {0} and slicing is CLOSED: {1}
|
Validation_VAL_Profile_NotSlice = This element does not match any known slice {0} and slicing is CLOSED: {1}
|
||||||
Validation_VAL_Profile_OutOfOrder = As specified by profile {0}, Element ''{1}'' is out of order
|
Validation_VAL_Profile_OutOfOrder = As specified by profile {0}, Element ''{1}'' is out of order (found after {2})
|
||||||
Validation_VAL_Profile_SliceOrder = As specified by profile {0}, Element ''{1}'' is out of order in ordered slice
|
Validation_VAL_Profile_SliceOrder = As specified by profile {0}, Element ''{1}'' is out of order in ordered slice
|
||||||
Validation_VAL_Profile_Unknown = Profile reference ''{0}'' has not been checked because it is unknown
|
Validation_VAL_Profile_Unknown = Profile reference ''{0}'' has not been checked because it is unknown
|
||||||
VALIDATION_VAL_PROFILE_UNKNOWN_NOT_POLICY = Profile reference ''{0}'' has not been checked because it is unknown, and the validator is set to not fetch unknown profiles
|
VALIDATION_VAL_PROFILE_UNKNOWN_NOT_POLICY = Profile reference ''{0}'' has not been checked because it is unknown, and the validator is set to not fetch unknown profiles
|
||||||
|
|
Loading…
Reference in New Issue