]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw_rados.cc: fix invalid iterator comparison 476/head
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Wed, 31 Jul 2013 22:34:41 +0000 (00:34 +0200)
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Wed, 31 Jul 2013 22:34:41 +0000 (00:34 +0200)
The iterator should be compared against the end() function of
the same iter() from region_conn_map.

CID 1058791 (#1 of 1): Invalid iterator comparison (MISMATCHED_ITERATOR)
  mismatched_comparison: Comparing "iter" from "this->region_conn_map" to
  "this->zone_conn_map.end()" from "this->zone_conn_map".

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
src/rgw/rgw_rados.cc

index aba5cdf0ee273796298acc5da2a2526d2b30cfb4..222b79a7d2ecfdabaee717d1efaf199ee02ab6c1 100644 (file)
@@ -2551,7 +2551,7 @@ int RGWRados::copy_obj(void *ctx,
         conn = rest_master_conn;
       } else {
         map<string, RGWRESTConn *>::iterator iter = region_conn_map.find(src_bucket_info.region);
-        if (iter == zone_conn_map.end()) {
+        if (iter == region_conn_map.end()) {
           ldout(cct, 0) << "could not find region connection to region: " << source_zone << dendl;
           return -ENOENT;
         }