Changeset 1972
- Timestamp:
- 09/17/07 13:45:30 (10 months ago)
- Files:
-
- trunk/lib/soap/mapping/literalregistry.rb (modified) (1 diff)
- trunk/lib/soap/mapping/mapping.rb (modified) (2 diffs)
- trunk/lib/soap/mapping/registry.rb (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/soap/mapping/literalregistry.rb
r1970 r1972 355 355 def define_xmlattr_accessor(obj, qname) 356 356 # untaint depends GenSupport.safemethodname 357 name = XSD::CodeGen::GenSupport.safemethodname('xmlattr_' + qname.name).untaint357 name = Mapping.safemethodname('xmlattr_' + qname.name).untaint 358 358 unless obj.respond_to?(name) 359 359 # untaint depends QName#dump trunk/lib/soap/mapping/mapping.rb
r1971 r1972 376 376 end 377 377 378 def self.safemethodname(name) 379 Thread.current[:SOAPMapping][:SafeMethodName][name] ||= 380 XSD::CodeGen::GenSupport.safemethodname(name) 381 end 382 378 383 def self.safevarname(name) 379 384 Thread.current[:SOAPMapping][:SafeVarName][name] ||= … … 562 567 data[:RootTypeHint] = opt[:root_type_hint] 563 568 data[:SchemaDefinition] = {} 569 data[:SafeConstName] = {} 570 data[:SafeMethodName] = {} 564 571 data[:SafeVarName] = {} 565 data[:SafeConstName] = {}566 572 yield 567 573 end trunk/lib/soap/mapping/registry.rb
r1971 r1972 107 107 def __define_attr_accessor(qname) 108 108 # untaint depends GenSupport.safemethodname 109 name = XSD::CodeGen::GenSupport.safemethodname(qname.name).untaint109 name = Mapping.safemethodname(qname.name).untaint 110 110 # untaint depends on QName#dump 111 111 qnamedump = qname.dump.untaint … … 251 251 value = Mapping.get_attribute(obj, attrname) 252 252 if value.nil? 253 attrname = 254 XSD::CodeGen::GenSupport.safemethodname('xmlattr_' + qname.name) 253 attrname = Mapping.safemethodname('xmlattr_' + qname.name) 255 254 value = Mapping.get_attribute(obj, attrname) 256 255 end