Welcome to the "trac"-ing site of soap4r!
[soap4r] [httpclient] [openpgp4u] [pkcs1] [logger] [csv] [vtr]

Changeset 1972

Show
Ignore:
Timestamp:
09/17/07 13:45:30 (10 months ago)
Author:
nahi
Message:
  • cache the result of XSD::CodeGen?.safemethodname, too.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lib/soap/mapping/literalregistry.rb

    r1970 r1972  
    355355  def define_xmlattr_accessor(obj, qname) 
    356356    # untaint depends GenSupport.safemethodname 
    357     name = XSD::CodeGen::GenSupport.safemethodname('xmlattr_' + qname.name).untaint 
     357    name = Mapping.safemethodname('xmlattr_' + qname.name).untaint 
    358358    unless obj.respond_to?(name) 
    359359      # untaint depends QName#dump 
  • trunk/lib/soap/mapping/mapping.rb

    r1971 r1972  
    376376  end 
    377377 
     378  def self.safemethodname(name) 
     379    Thread.current[:SOAPMapping][:SafeMethodName][name] ||= 
     380      XSD::CodeGen::GenSupport.safemethodname(name) 
     381  end 
     382 
    378383  def self.safevarname(name) 
    379384    Thread.current[:SOAPMapping][:SafeVarName][name] ||= 
     
    562567        data[:RootTypeHint] = opt[:root_type_hint] 
    563568        data[:SchemaDefinition] = {} 
     569        data[:SafeConstName] = {} 
     570        data[:SafeMethodName] = {} 
    564571        data[:SafeVarName] = {} 
    565         data[:SafeConstName] = {} 
    566572        yield 
    567573      end 
  • trunk/lib/soap/mapping/registry.rb

    r1971 r1972  
    107107  def __define_attr_accessor(qname) 
    108108    # untaint depends GenSupport.safemethodname 
    109     name = XSD::CodeGen::GenSupport.safemethodname(qname.name).untaint 
     109    name = Mapping.safemethodname(qname.name).untaint 
    110110    # untaint depends on QName#dump 
    111111    qnamedump = qname.dump.untaint 
     
    251251    value = Mapping.get_attribute(obj, attrname) 
    252252    if value.nil? 
    253       attrname = 
    254         XSD::CodeGen::GenSupport.safemethodname('xmlattr_' + qname.name) 
     253      attrname = Mapping.safemethodname('xmlattr_' + qname.name) 
    255254      value = Mapping.get_attribute(obj, attrname) 
    256255    end