------------------------------------------------------------ revno: 18328 committer: Morten Olav Hansen <morte...@gmail.com> branch nick: dhis2 timestamp: Thu 2015-02-19 14:27:26 +0700 message: minor fix, downcast related program to idObject to avoid recursion (if program points to itself) modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java
-- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2015-02-18 13:39:52 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2015-02-19 07:27:26 +0000 @@ -34,7 +34,6 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; - import org.hisp.dhis.attribute.AttributeValue; import org.hisp.dhis.common.BaseIdentifiableObject; import org.hisp.dhis.common.DxfNamespaces; @@ -221,7 +220,7 @@ { return ++version; } - + // ------------------------------------------------------------------------- // Getters and setters // ------------------------------------------------------------------------- @@ -482,6 +481,7 @@ } @JsonProperty + @JsonSerialize( as = BaseIdentifiableObject.class ) @JsonView( { DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class } ) @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) public Program getRelatedProgram() @@ -573,7 +573,7 @@ Program program = (Program) other; version = program.getVersion(); - + if ( MergeStrategy.MERGE_ALWAYS.equals( strategy ) ) { description = program.getDescription(); @@ -594,7 +594,7 @@ } else if ( MergeStrategy.MERGE_IF_NOT_NULL.equals( strategy ) ) { - description = program.getDescription() == null ? description : program.getDescription(); + description = program.getDescription() == null ? description : program.getDescription(); dateOfEnrollmentDescription = program.getDateOfEnrollmentDescription() == null ? dateOfEnrollmentDescription : program.getDateOfEnrollmentDescription(); dateOfIncidentDescription = program.getDateOfIncidentDescription() == null ? dateOfIncidentDescription : program.getDateOfIncidentDescription(); type = program.getType() == null ? type : program.getType();
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp