Fixes issue with optional option by code.

opensrp · Aug 4, 2019 · e6eb75b · e6eb75b
1 parent ccf7599
commit e6eb75b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/model/ImmutableOptionSet.java b/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/model/ImmutableOptionSet.java
@@ -85,6 +85,8 @@ public List<Option> getOptions()
     @Override
     public Optional<Option> getOptionalOptionByCode( @Nullable String code )
     {
-        return delegate.getOptionalOptionByCode( code );
+        final Option option = delegate.getOptionalOptionByCode( code ).orElse( null );
+
+        return option == null ? Optional.empty() : Optional.of( option instanceof WritableOption ? new ImmutableOption( (WritableOption) option ) : option );
     }
 }