summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2010-06-30 20:35:12 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2010-06-30 20:35:12 +0000
commitb8d6c4801b02af8323e7e3f83edab97174af659d (patch)
tree8fdd64e14e870fb0eec576a3a8885a740b4f8fcd
parent4536f442aaecb5a82cb950b2a2692f0f23c42cd5 (diff)
downloadATCD-b8d6c4801b02af8323e7e3f83edab97174af659d.tar.gz
Wed Jun 30 20:34:42 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
* DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp: Fix for crash on shutdown for windows.
-rw-r--r--CIAO/ChangeLog8
-rw-r--r--CIAO/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp1
2 files changed, 8 insertions, 1 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index d0463120d2a..1cd933c1a98 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,8 +1,14 @@
+Wed Jun 30 20:34:42 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
+
+ * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp:
+
+ Fix for crash on shutdown for windows.
+
Wed Jun 30 16:05:10 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
* DAnCE/NodeApplication/NodeApplication_Impl.cpp:
- Fixed a bug where connections weren't properly collated.
+ Fixed a bug where connections weren't properly collated.
Wed Jun 30 15:02:07 UTC 2010 Adam Mitz <mitza@ociweb.com>
diff --git a/CIAO/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp b/CIAO/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp
index bd7717dfb0f..508b3ce203a 100644
--- a/CIAO/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp
+++ b/CIAO/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp
@@ -553,6 +553,7 @@ namespace DAnCE
{
info = *i;
this->server_infos_.erase (i);
+ break;
}
}
}