Merge into master from pull request #60:
java_model: don't consider virtual classes as fixed length (https://github.com/floodlight/loxigen/pull/60)
diff --git a/Makefile b/Makefile
index 99ad397..5fee0c1 100644
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,7 @@
clean:
rm -rf loxi_output # only delete generated files in the default directory
+ rm -rf openflowj-loxi
rm -f loxigen.log loxigen-test.log .loxi_ts.c .loxi_ts.python .loxi_ts.java
debug:
diff --git a/java_gen/java_model.py b/java_gen/java_model.py
index bd1967b..4f77390 100644
--- a/java_gen/java_model.py
+++ b/java_gen/java_model.py
@@ -580,7 +580,8 @@
@property
def is_fixed_length(self):
""" true iff this class serializes to a fixed length on the wire """
- return (self.ir_class.name, self.version.int_version) in of_g.is_fixed_length
+ return (self.ir_class.name, self.version.int_version) in of_g.is_fixed_length and \
+ not self.is_virtual
def all_properties(self):
return self.interface.members