acceptor.cxx (4f730c67) acceptor.cxx (55f5063a)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 75 unchanged lines hidden (view full) ---

84 {
85 osl::MutexGuard g(m_aMutex);
86 t = m_thread;
87 }
88 //prevent locking if the thread is still waiting
89 m_bDying = true;
90 m_cEnable.set();
91 osl_joinWithThread(t);
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 75 unchanged lines hidden (view full) ---

84 {
85 osl::MutexGuard g(m_aMutex);
86 t = m_thread;
87 }
88 //prevent locking if the thread is still waiting
89 m_bDying = true;
90 m_cEnable.set();
91 osl_joinWithThread(t);
92 osl_destroyThread(t);
92 // osl_destroyThread(t);
93 {
94 // Make the final state of m_bridges visible to this thread (since
95 // m_thread is joined, the code that follows is the only one left
96 // accessing m_bridges):
97 osl::MutexGuard g(m_aMutex);
98 }
99 for (;;) {
100 com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > b(

--- 247 unchanged lines hidden --- 		93 {
94 // Make the final state of m_bridges visible to this thread (since
95 // m_thread is joined, the code that follows is the only one left
96 // accessing m_bridges):
97 osl::MutexGuard g(m_aMutex);
98 }
99 for (;;) {
100 com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > b(

--- 247 unchanged lines hidden ---