summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwolff1 <wolff1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-03-12 15:28:56 +0000
committerwolff1 <wolff1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-03-12 15:28:56 +0000
commit8da86b6d203c2df911220e6ebfcf70b803bd63b4 (patch)
treec5a5c2e532bdec04fec00d73a84af28c1acc0d95
parentca6a15f2d3e5674e3798cf9c6e2e167a11592581 (diff)
downloadATCD-8da86b6d203c2df911220e6ebfcf70b803bd63b4.tar.gz
ChangeLogTag: Thu Mar 12 15:28:41 UTC 2009 Friedhelm Wolf <fwolf@dre.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/orbsvcs/orbsvcs/LWFT/ReplicationManager.cpp7
2 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a84d6a01180..89c084705fd 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Thu Mar 12 15:28:41 UTC 2009 Friedhelm Wolf <fwolf@dre.vanderbilt.edu>
+
+ * orbsvcs/orbsvcs/LWFT/ReplicationManager.cpp:
+
+ Fixed behavior of static_selection_algo ().
+
Thu Mar 12 03:48:16 UTC 2009 Friedhelm Wolf <fwolf@dre.vanderbilt.edu>
* orbsvcs/examples/FaultTolerance/FLARe/Worker/server.cpp
diff --git a/TAO/orbsvcs/orbsvcs/LWFT/ReplicationManager.cpp b/TAO/orbsvcs/orbsvcs/LWFT/ReplicationManager.cpp
index 42da770673b..56f18df81e9 100644
--- a/TAO/orbsvcs/orbsvcs/LWFT/ReplicationManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LWFT/ReplicationManager.cpp
@@ -935,7 +935,7 @@ ReplicationManager_i::static_selection_algo (void)
APP_SET tmp_apps;
for (OBJECTID_APPSET_MAP::iterator appset_it = objectid_appset_map_.begin ();
- appset_it != objectid_appset_map_.begin ();
+ appset_it != objectid_appset_map_.end ();
++appset_it)
{
ACE_DEBUG ((LM_INFO, "[\toid %s:", appset_it->key ().c_str ()));
@@ -995,8 +995,9 @@ ReplicationManager_i::static_selection_algo (void)
}
} // end for tmp_apps
- objectid_rankedior_map_.bind (appset_it->key (),
- iorlist);
+ if (iorlist.ior_list.size () > 0)
+ objectid_rankedior_map_.bind (appset_it->key (),
+ iorlist);
ACE_DEBUG ((LM_INFO, "\n"));
} // end for objectid_appset_map_