Skip to content

Commit 7701716

Browse files
author
Max Robert
committed
Refs #12. Update to Python sandbox to support child devices
1 parent da12083 commit 7701716

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

redhawk/src/base/framework/python/ossie/dynamiccomponent.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
from omniORB import any as _any
66
import threading
77

8-
from utils.sandbox.model import SandboxDevice
9-
108
class DynamicComponentRegistry:
119
def __init__(self):
1210
self.__components = {}

redhawk/src/base/framework/python/ossie/utils/sb/domainless.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ def show():
301301
sandbox = _getSandbox()
302302
print "Components Running:"
303303
print "------------------"
304-
print '*********'
305304
for component in sandbox.getComponents():
306305
print component._instanceName, component
307306
print "\n"

redhawk/src/control/sdr/devmgr/DeviceManager_impl.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1708,13 +1708,12 @@ throw (CORBA::SystemException, CF::InvalidObjectReference)
17081708
//Get properties from SPD
17091709
std::string spdFile = ossie::corba::returnString(registeringDevice->softwareProfile());
17101710
std::string spd_id;
1711-
if (not spdFile.empty()) {
1711+
if ((not spdFile.empty()) and (spdinfo != NULL)) {
17121712
std::string spd_name = spdinfo->getName();
17131713
spd_id = spdinfo->getID();
17141714
std::string deviceid = ossie::corba::returnString(registeringDevice->identifier());
17151715
RH_INFO(this->_baseLog, "Device LABEL: " << deviceLabel << " SPD loaded: " << spd_name << "' - '" << spd_id );
17161716

1717-
17181717
//
17191718
// call resource's initializeProperties method to handle any properties required for construction
17201719
//
@@ -1796,7 +1795,7 @@ throw (CORBA::SystemException, CF::InvalidObjectReference)
17961795
{
17971796
boost::recursive_mutex::scoped_lock lock(registeredDevicesmutex);
17981797

1799-
if (not spdFile.empty()) {
1798+
if ((not spdFile.empty()) and (spdinfo != NULL)) {
18001799
//configure properties
18011800
try {
18021801
RH_DEBUG(this->_baseLog, "Configuring device " << deviceLabel << " on Device Manager " << _label);

0 commit comments

Comments
 (0)