honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More logging to try and figure out the travis failures

This commit is contained in:
jamesagnew 2015-12-14 22:12:54 -05:00
parent 60261672c1
commit b2a9836cda
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildUndeclaredExtensionDefinition.java
View File

@ -178,7 +178,7 @@ public class RuntimeChildUndeclaredExtensionDefinition extends BaseRuntimeChildD
* type. * type.
*/ */
if (!qualifiedName.startsWith("ca.uhn.fhir.model")) { if (!qualifiedName.startsWith("ca.uhn.fhir.model")) {
if (!qualifiedName.startsWith("org.hl7.fhir.instance.model")) { if (!qualifiedName.startsWith("org.hl7.fhir")) {
continue; continue;
} }
} }

8
hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java
View File

@ -28,6 +28,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.TreeSet;
import javax.xml.stream.events.StartElement; import javax.xml.stream.events.StartElement;
import javax.xml.stream.events.XMLEvent; import javax.xml.stream.events.XMLEvent;
@ -1731,9 +1732,10 @@ class ParserState<T> {
public void enteringNewElement(String theNamespaceUri, String theLocalPart) throws DataFormatException { public void enteringNewElement(String theNamespaceUri, String theLocalPart) throws DataFormatException {
BaseRuntimeElementDefinition<?> target = myContext.getRuntimeChildUndeclaredExtensionDefinition().getChildByName(theLocalPart); BaseRuntimeElementDefinition<?> target = myContext.getRuntimeChildUndeclaredExtensionDefinition().getChildByName(theLocalPart);
if (target == null) { if (target == null) {
myErrorHandler.unknownElement(null, theLocalPart); throw new DataFormatException("Unknown " + theLocalPart + " - Valid names are: " + new TreeSet<String>(myContext.getRuntimeChildUndeclaredExtensionDefinition().getValidChildNames()));
push(new SwallowChildrenWholeState(getPreResourceState())); // myErrorHandler.unknownElement(null, theLocalPart);
return; // push(new SwallowChildrenWholeState(getPreResourceState()));
// return;
} }
switch (target.getChildType()) { switch (target.getChildType()) {