Merge pull request #168 from onc-healthit/develop

Merge develop into master for SITE-3.1.66 March 2023 Release
onc-healthit · Mar 28, 2023 · f7ae5af · f7ae5af
2 parents 72d8007 + e6b8203
commit f7ae5af
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/configuration/ccdaReferenceValidatorConfig.xml b/configuration/ccdaReferenceValidatorConfig.xml
@@ -141,7 +141,7 @@
 	</expression>
 
 	<!--2. This addr MAY contain zero or one [0..1] postalCode, which SHALL be selected from ValueSet PostalCode urn:oid:2.16.840.1.113883.3.88.12.80.2 DYNAMIC (CONF:1198-5403).-->
-	<expression xpathExpression="/v3:ClinicalDocument/v3:templateId[@root='2.16.840.1.113883.10.20.22.1.1' and @extension='2015-08-01']/ancestor::v3:ClinicalDocument[1]/v3:recordTarget/v3:patientRole/v3:patient/v3:birthplace/v3:place/v3:addr/v3:postalCode">
+	<expression xpathExpression="/v3:ClinicalDocument/v3:templateId[@root='2.16.840.1.113883.10.20.22.1.1' and @extension='2015-08-01']/ancestor::v3:ClinicalDocument[1]/v3:recordTarget/v3:patientRole/v3:patient/v3:birthplace/v3:place/v3:addr/v3:postalCode[not(@nullFlavor)]">
 		<validator>
 			<name>TextNodeValidator</name>
 			<validationResultSeverityLevels>
@@ -152,7 +152,7 @@
 	</expression>
 
 	<!--3. If country is US, this addr SHALL contain exactly one [1..1] state, which SHALL be selected from ValueSet StateValueSet 2.16.840.1.113883.3.88.12.80.1 DYNAMIC (CONF:1198-5402).-->
-	<expression xpathExpression="/v3:ClinicalDocument/v3:templateId[@root='2.16.840.1.113883.10.20.22.1.1' and @extension='2015-08-01']/ancestor::v3:ClinicalDocument[1]/v3:recordTarget/v3:patientRole/v3:patient/v3:birthplace/v3:place/v3:addr/v3:state">
+	<expression xpathExpression="/v3:ClinicalDocument/v3:templateId[@root='2.16.840.1.113883.10.20.22.1.1' and @extension='2015-08-01']/ancestor::v3:ClinicalDocument[1]/v3:recordTarget/v3:patientRole/v3:patient/v3:birthplace/v3:place/v3:addr/v3:state[not(@nullFlavor)]">
 		<validator>
 			<name>TextNodeValidator</name>
 			<validationResultSeverityLevels>
@@ -161,7 +161,6 @@
 			<allowedValuesetOids>2.16.840.1.113883.3.88.12.80.1</allowedValuesetOids>
 		</validator>
 	</expression>
-
 	<!--a. The languageCommunication, if present, SHALL contain exactly one [1..1] languageCode, which SHALL be selected from ValueSet Language urn:oid:2.16.840.1.113883.1.11.11526 DYNAMIC (CONF:1198-5407).-->
 	<expression xpathExpression="/v3:ClinicalDocument/v3:templateId[@root='2.16.840.1.113883.10.20.22.1.1' and @extension='2015-08-01']/ancestor::v3:ClinicalDocument[1]/v3:recordTarget/v3:patientRole/v3:patient/v3:languageCommunication/v3:languageCode[not(@nullFlavor)]">
 		<validator>
@@ -2151,4 +2150,4 @@
 		</validator>
 	</expression>
 	<!--  VITAL SIGNS END-->
-</configurations>
+</configurations>
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.sitenv</groupId>
     <artifactId>referenceccdavalidator</artifactId>
-    <version>1.0.67</version>
+    <version>1.0.68</version>
     <packaging>war</packaging>
     <name>Reference CCDA Validator</name>
 
@@ -303,7 +303,7 @@
                 <version>9.2.2.v20140723</version>
                 <configuration>
                     <scanIntervalSeconds>3</scanIntervalSeconds>
-                    <jvmArgs>-Xmx2024m -Xms2024m -XX:PermSize=256m -XX:MaxPermSize=512m</jvmArgs>
+                    <jvmArgs>-Xmx5120m -Xms5120m -XX:PermSize=1024m -XX:MaxPermSize=1024m</jvmArgs>
                     <webApp>
                         <contextPath>/referenceccdaservice</contextPath>
                     </webApp>

diff --git a/src/main/java/org/sitenv/referenceccda/services/ReferenceCCDAValidationService.java b/src/main/java/org/sitenv/referenceccda/services/ReferenceCCDAValidationService.java
@@ -173,6 +173,7 @@ private List<RefCCDAValidationResult> runValidators(String validationObjective,
 			throw new RuntimeException("Error getting CCDA contents from provided file", e);
 		} finally {
 			closeFileInputStream(ccdaFileInputStream);
+			ccdaFile = null;
 		}
 		return validatorResults;
 	}