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

Changeset 1458

Show
Ignore:
Timestamp:
03/12/05 12:07:17 (4 years ago)
Author:
nahi
Message:

follow ruby-1.9 (unconfirmed) change. avoid local variable name crash with private method call.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/soap/wsdlDriver.rb

    r1445 r1458  
    122122  def create_param_def(op_bind) 
    123123    op = op_bind.find_operation 
    124     param_def = [] 
     124    result = [] 
    125125    inputparts = op.inputparts 
    126126    if op_bind.input.soapbody.parts 
    …… 
    128128    end 
    129129    inputparts.each do |part| 
    130       partqname = partqname(part) 
    131       param_def << param_def(::SOAP::RPC::SOAPMethod::IN, partqname) 
     130      result << param_def(::SOAP::RPC::SOAPMethod::IN, partqname(part)) 
    132131    end 
    133132    outputparts = op.outputparts 
    …… 
    137136    if op_bind.soapoperation_style == :rpc 
    138137      part = outputparts.shift 
    139       param_def << param_def(::SOAP::RPC::SOAPMethod::RETVAL, partqname(part)) 
     138      result << param_def(::SOAP::RPC::SOAPMethod::RETVAL, partqname(part)) 
    140139      outputparts.each do |part| 
    141         param_def << param_def(::SOAP::RPC::SOAPMethod::OUT, partqname(part)) 
     140        result << param_def(::SOAP::RPC::SOAPMethod::OUT, partqname(part)) 
    142141      end 
    143142    else 
    144143      outputparts.each do |part| 
    145         param_def << param_def(::SOAP::RPC::SOAPMethod::OUT, partqname(part)) 
    146       end 
    147     end 
    148     param_def 
     144        result << param_def(::SOAP::RPC::SOAPMethod::OUT, partqname(part)) 
     145      end 
     146    end 
     147    result 
    149148  end 
    150149 

  • trunk/lib/wsdl/soap/definitions.rb

    r1441 r1458  
    7878  def collect_faulttypes 
    7979    result = [] 
    80     collect_fault_messages.each do |message| 
    81       parts = message(message).parts 
    82       if parts.size != 1 
     80    collect_fault_messages.each do |name| 
     81      faultparts = message(name).parts 
     82      if faultparts.size != 1 
    8383        raise RuntimeError.new("expecting fault message to have only 1 part") 
    8484      end 
    85       if result.index(parts[0].type).nil? 
    86         result << parts[0].type 
     85      if result.index(faultparts[0].type).nil? 
     86        result << faultparts[0].type 
    8787      end 
    8888    end 

  • trunk/test/soap/header/server.cgi

    r1168 r1458  
    8686 
    8787    def on_simple_inbound(my_header, mu) 
    88       auth = false 
     88      succeeded = false 
    8989      userid = my_header["userid"] 
    9090      passwd = my_header["passwd"] 
    9191      if login(userid, passwd) 
    92         auth = true 
     92        succeeded = true 
    9393      elsif sessionid = my_header["sessionid"] 
    9494        if userid = auth(sessionid) 
    9595          destroy_session(sessionid) 
    96           auth = true 
     96          succeeded = true 
    9797        end 
    9898      end 
    99       raise RuntimeError.new("authentication failed") unless auth 
     99      raise RuntimeError.new("authentication failed") unless succeeded 
    100100      @userid = userid 
    101101      @sessionid = create_session(userid)