#82734# some changes with pathtoroot handling

2 files changed, 11 insertions, 7 deletions

diff --git a/configmgr/source/treecache/disposetimer.cxx b/configmgr/source/treecache/disposetimer.cxx
index 4e45a4b407a5..07e0557ac8ba 100644
--- a/configmgr/source/treecache/disposetimer.cxx
+++ b/configmgr/source/treecache/disposetimer.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: disposetimer.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: lla $ $Date: 2001-01-26 07:51:57 $
+ *  last change: $Author: lla $ $Date: 2001-01-29 13:02:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -436,7 +436,7 @@ void OTreeCacheWriteScheduler::runDisposer()
 
     for (CacheWriteList::iterator it = m_aWriteList.begin();
          it != m_aWriteList.end();
-         ++it)
+         )
     {
         vos::ORef< OOptions > xTaskOption = *it;
         if (xTaskOption.isValid())
@@ -446,10 +446,13 @@ void OTreeCacheWriteScheduler::runDisposer()
             {
                 it = m_aWriteList.erase(it);
             }
+            else
+                ++it;
         }
         else
         {
             CFG_TRACE_WARNING_NI("runDisposer: TaskOption not valid");
+            it = m_aWriteList.erase(it);
         }
     }
     // m_aWriteList.clear();
diff --git a/configmgr/source/treecache/disposetimer.hxx b/configmgr/source/treecache/disposetimer.hxx
index 7d5e48d823bf..2f637542eda1 100644
--- a/configmgr/source/treecache/disposetimer.hxx
+++ b/configmgr/source/treecache/disposetimer.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: disposetimer.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: lla $ $Date: 2001-01-26 07:51:57 $
+ *  last change: $Author: lla $ $Date: 2001-01-29 13:02:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,7 +68,8 @@
 #include <osl/mutex.hxx>
 #include <vos/timer.hxx>
 #include <map>
-#include <queue>
+// #include <queue>
+#include <list>
 
 namespace configmgr
 {
@@ -198,7 +199,7 @@ namespace configmgr
     // (better control)
     class OTreeCacheWriteScheduler
     {
-        typedef std::vector<vos::ORef< OOptions > > CacheWriteList; // fire and forget!
+        typedef std::list<vos::ORef< OOptions > > CacheWriteList; // fire and forget!
 
         class Timer : public vos::OTimer
         {