Fix unintended changes from prior commit

pull/2/head
Timothy Pearson 12 years ago
parent 4bd0fd248f
commit a669fb0c59

@ -91,7 +91,6 @@ TDEBackend::~TDEBackend()
} }
void TDEBackend::AddDeviceHandler(TDEGenericDevice *device) { void TDEBackend::AddDeviceHandler(TDEGenericDevice *device) {
printf("[RAJA DEBUG 100.0] In TDEBackend::AddDeviceHandler for '%s'\n\r", device->uniqueID().ascii()); fflush(stdout);
if (device->type() == TDEGenericDeviceType::Disk) { if (device->type() == TDEGenericDeviceType::Disk) {
TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(device); TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(device);
AddDevice(sdevice); AddDevice(sdevice);
@ -99,7 +98,6 @@ printf("[RAJA DEBUG 100.0] In TDEBackend::AddDeviceHandler for '%s'\n\r", device
} }
void TDEBackend::RemoveDeviceHandler(TDEGenericDevice *device) { void TDEBackend::RemoveDeviceHandler(TDEGenericDevice *device) {
printf("[RAJA DEBUG 100.0] In TDEBackend::RemoveDeviceHandler for '%s'\n\r", device->uniqueID().ascii()); fflush(stdout);
if (device->type() == TDEGenericDeviceType::Disk) { if (device->type() == TDEGenericDeviceType::Disk) {
TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(device); TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(device);
RemoveDevice(sdevice); RemoveDevice(sdevice);
@ -107,7 +105,6 @@ printf("[RAJA DEBUG 100.0] In TDEBackend::RemoveDeviceHandler for '%s'\n\r", dev
} }
void TDEBackend::ModifyDeviceHandler(TDEGenericDevice *device) { void TDEBackend::ModifyDeviceHandler(TDEGenericDevice *device) {
printf("[RAJA DEBUG 100.0] In TDEBackend::ModifyDeviceHandler for '%s'\n\r", device->uniqueID().ascii()); fflush(stdout);
if (device->type() == TDEGenericDeviceType::Disk) { if (device->type() == TDEGenericDeviceType::Disk) {
TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(device); TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(device);
ModifyDevice(sdevice); ModifyDevice(sdevice);
@ -1201,12 +1198,10 @@ TQString TDEBackend::unmount(const TQString &_udi)
// There is a possibility that the storage device was unceremoniously removed from the system immediately after it was unmounted // There is a possibility that the storage device was unceremoniously removed from the system immediately after it was unmounted
// There is no reliable way to know if this happened either! // There is no reliable way to know if this happened either!
// For now, see if the device node still exists // For now, see if the device node still exists
// RAJA FIXME TQFileInfo checkDN(node);
// Is this causing/masking the Eject/Unmount race condition? if (!checkDN.exists()) {
// TQFileInfo checkDN(node); m_mediaList.removeMedium(uid, true);
// if (!checkDN.exists()) { }
// m_mediaList.removeMedium(uid, true);
// }
return TQString(); return TQString();
} }

Loading…
Cancel
Save