Update of /cvsroot/robotflow/RobotFlow/MARIE/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19925
Modified Files:
extractMarieCommandBehavior.cpp extractMarieDataMap.cpp
newMarieCommandGripper.cpp newMarieDataGripper.cpp
Log Message:
remove memory leaks
Index: newMarieCommandGripper.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandGripper.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** newMarieCommandGripper.cpp 7 Nov 2005 20:33:06 -0000 1.1
--- newMarieCommandGripper.cpp 11 Jul 2006 02:23:39 -0000 1.2
***************
*** 105,108 ****
--- 105,113 ----
stateIt->second = composite->get(stateIt->first);
}
+ catch(BaseException *e)
+ {
+ e->print(cerr);
+ delete e;
+ }
catch(...)
{}
Index: extractMarieCommandBehavior.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieCommandBehavior.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** extractMarieCommandBehavior.cpp 12 Sep 2005 21:31:19 -0000 1.8
--- extractMarieCommandBehavior.cpp 11 Jul 2006 02:23:30 -0000 1.9
***************
*** 160,165 ****
--- 160,173 ----
paramsComposite->addField(key.str(), ObjectValue);
}
+ catch(BaseException *e)
+ {
+ ObjectRef ObjectValue(new String(value.str()));
+ paramsComposite->addField(key.str(),ObjectValue);
+ e->print(cerr);
+ delete e;
+ }
catch(...)
{
+ //cerr<<"unable to read FlowDesigner Object"<<std::endl;
//unable to read FlowDesigner Object
//output standard string
***************
*** 182,187 ****
--- 190,203 ----
resultsComposite->addField(key.str(), ObjectValue);
}
+ catch (BaseException *e)
+ {
+ ObjectRef ObjectValue(new String(value.str()));
+ resultsComposite->addField(key.str(),ObjectValue);
+ e->print(cerr);
+ delete e;
+ }
catch(...)
{
+ //cerr<<"unable to read FlowDesigner Object"<<std::endl;
//unable to read FlowDesigner Object
//output standard string
Index: newMarieDataGripper.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataGripper.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** newMarieDataGripper.cpp 7 Nov 2005 20:33:06 -0000 1.1
--- newMarieDataGripper.cpp 11 Jul 2006 02:23:42 -0000 1.2
***************
*** 104,107 ****
--- 104,112 ----
stateIt->second = composite->get(stateIt->first);
}
+ catch(BaseException *e)
+ {
+ e->print(cerr);
+ delete e;
+ }
catch(...)
{}
Index: extractMarieDataMap.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataMap.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** extractMarieDataMap.cpp 12 Sep 2005 21:31:19 -0000 1.5
--- extractMarieDataMap.cpp 11 Jul 2006 02:23:35 -0000 1.6
***************
*** 104,107 ****
--- 104,116 ----
cType->addField(key.str(), ObjectValue);
}
+ catch(BaseException *e)
+ {
+ //unable to read FlowDesigner Object
+ //output standard string
+ ObjectRef ObjectValue(new String(value.str()));
+ cType->addField(key.str(),ObjectValue);
+ e->print(cerr);
+ delete e;
+ }
catch(...)
{
|
