### Eclipse Workspace Patch 1.0 #P trunk Index: lib/maven-ant-tasks-2.1.1.jar =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: lib\maven-ant-tasks-2.1.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: web/src/main/java/org/openmrs/web/controller/patient/PatientFormController.java =================================================================== --- web/src/main/java/org/openmrs/web/controller/patient/PatientFormController.java (revision 17328) +++ web/src/main/java/org/openmrs/web/controller/patient/PatientFormController.java (working copy) @@ -224,6 +224,8 @@ || countries[i] != null || lats[i] != null || longs[i] != null || pCodes[i] != null || counties[i] != null || cells[i] != null ) { */ + if (!"".equals(add1s[i])) { + PersonAddress pa = new PersonAddress(); if (add1s.length >= i + 1) pa.setAddress1(add1s[i]); @@ -250,6 +252,7 @@ patient.addAddress(pa); //} } + } Iterator addresses = patient.getAddresses().iterator(); PersonAddress currentAddress = null; PersonAddress preferredAddress = null; Index: pom.xml =================================================================== --- pom.xml (revision 17328) +++ pom.xml (working copy) @@ -520,7 +520,16 @@ + + + + + + + + +