From: David Reiss <dreiss@apache.org>
Date: Wed, 28 Nov 2007 20:15:11 +0000 (+0000)
Subject: Thrift: Fix a backwards change.
X-Git-Tag: 0.2.0~1094
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=bef54c0647b22128c9035cfbc4d4b112ab5e68f8;p=common%2Fthrift.git

Thrift: Fix a backwards change.

Summary:
Got it right in trunk, but wrong in thrift.

Blame Rev: 69504

Reviewed By: mcslee

Test Plan:
Tested in trunk AND did a diff with trunk.

Revert Plan: ok


git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665378 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/lib/php/src/Thrift.php b/lib/php/src/Thrift.php
index 2f7bdb4c..c17c5178 100644
--- a/lib/php/src/Thrift.php
+++ b/lib/php/src/Thrift.php
@@ -448,13 +448,13 @@ abstract class TBase {
           $xfer += $key->read($input);
           break;
         case TType::MAP:
-          $xfer += $this->_readMap($elem, $kspec, $input);
+          $xfer += $this->_readMap($key, $kspec, $input);
           break;
         case TType::LST:
-          $xfer += $this->_readList($elem, $kspec, $input, false);
+          $xfer += $this->_readList($key, $kspec, $input, false);
           break;
         case TType::SET:
-          $xfer += $this->_readList($elem, $kspec, $input, true);
+          $xfer += $this->_readList($key, $kspec, $input, true);
           break;
         }
       }
@@ -513,13 +513,13 @@ abstract class TBase {
           $xfer += $elem->read($input);
           break;
         case TType::MAP:
-          $xfer += $this->_readMap($key, $espec, $input);
+          $xfer += $this->_readMap($elem, $espec, $input);
           break;
         case TType::LST:
-          $xfer += $this->_readList($key, $espec, $input, false);
+          $xfer += $this->_readList($elem, $espec, $input, false);
           break;
         case TType::SET:
-          $xfer += $this->_readList($key, $espec, $input, true);
+          $xfer += $this->_readList($elem, $espec, $input, true);
           break;
         }
       }