commit 2c0a2d777a752546d56e645e6e2926f9e4e2b005
author Andreas Wundsam <andreas.wundsam@bigswitch.com> Fri Nov 15 15:16:36 2013 -0800
committer Andreas Wundsam <andreas.wundsam@bigswitch.com> Fri Nov 15 15:18:33 2013 -0800
tree 6eeed6590a5ff8551f847002d2f7d73c838958d4
parent 50b832c84eb71f98fb93c0d3e40bcd9d2b16d696
parent 641e8b58aa61e39030e1ba0c486bc77308c56106

Merge branch 'master' of github.com:floodlight/loxigen into group_mod

Conflicts:
	java_gen/java_model.py
	loxi_front_end/frontend.py
	loxi_front_end/frontend_ir.py
	loxigen.py
	py_gen/templates/message.py
	utest/test_frontend.py

c_gen/build_of_g.py

diff --git a/c_gen/build_of_g.py b/c_gen/build_of_g.py
index 6e536fa..9ea6d34 100755
--- a/c_gen/build_of_g.py
+++ b/c_gen/build_of_g.py
@@ -424,7 +424,7 @@
 
             # Extensions
             experimenter = find_experimenter('of', cls)
-            if experimenter:
+            if experimenter and ofclass.is_subclassof("of_experimenter"):
                 val = find_type_value(ofclass, 'subtype')
                 type_maps.extension_message_subtype[wire_version][experimenter][cls] = val