Correct setting attributes on lazily loaded instances

aothms · aothms · commit c25cff6bad6a · 2017-06-15T14:12:03.000+02:00
diff --git a/src/ifcparse/IfcParse.cpp b/src/ifcparse/IfcParse.cpp
@@ -1008,6 +1008,10 @@ Argument* IfcEntityInstanceData::getArgument(unsigned int i) const {
 }
 
 void IfcEntityInstanceData::setArgument(unsigned int i, Argument* a, IfcUtil::ArgumentType attr_type) {
+	if (!initialized_) {
+		load_();
+	}
+
 	while (attributes_.size() < i) {
 		attributes_.push_back(new NullArgument());
 	}
diff --git a/src/ifcparse/IfcSpfHeader.cpp b/src/ifcparse/IfcSpfHeader.cpp
@@ -41,6 +41,8 @@ HeaderEntity::HeaderEntity(const char * const datatype, IfcFile* file)
 	if (file) {
 		offset_in_file_ = file->stream->Tell();
 		load_();
+	} else {
+		initialized_ = true;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1008,6 +1008,10 @@ Argument* IfcEntityInstanceData::getArgument(unsigned int i) const {`
`1008`	`1008`	`}`
`1009`	`1009`
`1010`	`1010`	`void IfcEntityInstanceData::setArgument(unsigned int i, Argument* a, IfcUtil::ArgumentType attr_type) {`
	`1011`	`+ if (!initialized_) {`
	`1012`	`+ load_();`
	`1013`	`+ }`
	`1014`	`+`
`1011`	`1015`	`while (attributes_.size() < i) {`
`1012`	`1016`	`attributes_.push_back(new NullArgument());`
`1013`	`1017`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ HeaderEntity::HeaderEntity(const char * const datatype, IfcFile* file)`
`41`	`41`	`if (file) {`
`42`	`42`	`offset_in_file_ = file->stream->Tell();`
`43`	`43`	`load_();`
	`44`	`+ } else {`
	`45`	`+ initialized_ = true;`
`44`	`46`	`}`
`45`	`47`	`}`
`46`	`48`