1 files changed, 15 insertions, 4 deletions
diff --git a/lib/soap/mapping/registry.rb b/lib/soap/mapping/registry.rb
index bdf14d4fc6..e98c98a6d4 100644
--- a/lib/soap/mapping/registry.rb
+++ b/lib/soap/mapping/registry.rb
@@ -426,10 +426,21 @@ private
     Mapping.set_instance_vars(obj, vars)
   end
 
-  def addextend2obj(obj, attr)
-    return unless attr
-    attr.split(/ /).reverse_each do |mstr|
-      obj.extend(Mapping.class_from_name(mstr))
+  if RUBY_VERSION >= '1.8.0'
+    def addextend2obj(obj, attr)
+      return unless attr
+      attr.split(/ /).reverse_each do |mstr|
+	obj.extend(Mapping.class_from_name(mstr))
+      end
+    end
+  else
+    # (class < false; self; end).ancestors includes "TrueClass" under 1.6...
+    def addextend2obj(obj, attr)
+      return unless attr
+      attr.split(/ /).reverse_each do |mstr|
+	m = Mapping.class_from_name(mstr)
+	obj.extend(m) if m.class == Module
+      end
     end
   end