Re: [mico-devel] Some more bug fixes

2009-01-08 Thread Karel Gardas 

Hi Thomas,

could you be so kind and send unified or context diff of your changes?
This way I don't need to retype all your changes here through the
keyboard when you already done this anyway.

Otherwise those three fixes below looks ok.

Thanks!
Karel

Schmidt Thomas wrote:
 Hi,
 
 Here are some more minor bug fixes:
 
 1. mico/demo/services/relship/TestServer.cc
 BaseRole and DerivedRole should be added without path component
 omg.org/.
 So instead of
 
 NamedRoleTypesHelper* nrth_TestRelationship = new
 NamedRoleTypesHelper (orb);
 nrth_TestRelationship-add (IDL:omg.org/Test/BaseRole:1.0,
 BaseRole);
 nrth_TestRelationship-add (IDL:omg.org/Test/DerivedRole1:1.0,
 DerivedRole1);
 
 you should better write
 
 NamedRoleTypesHelper* nrth_TestRelationship = new
 NamedRoleTypesHelper (orb);
 nrth_TestRelationship-add (IDL:Test/BaseRole:1.0, BaseRole);
 nrth_TestRelationship-add (IDL:Test/DerivedRole1:1.0,
 DerivedRole1);
 
 2. mico/coss/relship/RandomGenerator_impl.cc
 Bug fix of my previous fix. Method RandomGenerator_impl::rand()
 should check for 'proxy' mode
 only if check for 'generate' mode failed. Instead of:
 
 if (mode == RandomGenerator::generate)
   number = ::rand ();
 if (mode == RandomGenerator::proxy) {
   if (!random_numbers.empty ()) {
 number = *(random_numbers.begin ());
 random_numbers.pop_front ();
   }
   else {
 //::RandomGenerator::NoSuchNumber exception;
 //throw exception;
 mico_throw (RandomGenerator::NoSuchNumber());
   }
 }
 
 Add an 'else':
 
 if (mode == RandomGenerator::generate) {
   number = ::rand ();
 }
 else if (mode == RandomGenerator::proxy) {
   if (!random_numbers.empty ()) {
 number = *(random_numbers.begin ());
 random_numbers.pop_front ();
   }
   else {
 //::RandomGenerator::NoSuchNumber exception;
 //throw exception;
 mico_throw (RandomGenerator::NoSuchNumber());
 number = 0; // Avoid compiler warnings
   }
 }
 else {
   number = 0; // Should never happen. Exception?
 }
 
 Otherwise rand() would ever return 'zero' in 'generate' mode.
 
 3. ROADMAP
 'imr' is not a directory under micos devel root. Instead it is part
 of directory 'daemon'.
 
 
 Thomas Schmidt
 
 -- 
 Thomas Schmidt
 Schneiderstr. 16
 D-29575 Altenmedingen
 Phone: +49-5807-209976
 Cellular: +49-172-3011505
 Skype: ThCSchmidt
 Email: 01723011...@vodafone.de
 PGP: Key-ID: 0x810B6206
 
 
 
 
 
 ___
 Mico-devel mailing list
 Mico-devel@mico.org
 http://www.mico.org/mailman/listinfo/mico-devel


-- 
Karel Gardas  kgar...@objectsecurity.com
ObjectSecurity Ltd.   http://www.objectsecurity.com
___
Mico-devel mailing list
Mico-devel@mico.org
http://www.mico.org/mailman/listinfo/mico-devel

Re: [mico-devel] Some more bug fixes

2009-01-08 Thread Schmidt Thomas 

Sorry,

Am 08.01.2009 um 09:36 schrieb Karel Gardas:



Hi Thomas,

could you be so kind and send unified or context diff of your changes?
This way I don't need to retype all your changes here through the
keyboard when you already done this anyway.

here are the unified context diffs:


Otherwise those three fixes below looks ok.

Thanks!
Karel

Schmidt Thomas wrote:

Hi,

Here are some more minor bug fixes:

1. mico/demo/services/relship/TestServer.cc
BaseRole and DerivedRole should be added without path component
omg.org/.


--- TestServer.cc   20 Feb 2008 15:23:01 -  1.1
+++ TestServer.cc   5 Jan 2009 21:39:16 -   1.2
@@ -94,9 +94,9 @@

   NamedRoleTypesHelper*
 nrth_TestRelationship = new NamedRoleTypesHelper (orb);
-  nrth_TestRelationship-add (IDL:omg.org/Test/BaseRole:1.0,
+  nrth_TestRelationship-add (IDL:Test/BaseRole:1.0,
 BaseRole);
-  nrth_TestRelationship-add (IDL:omg.org/Test/DerivedRole1:1.0,
+  nrth_TestRelationship-add (IDL:Test/DerivedRole1:1.0,
  DerivedRole1);




2. mico/coss/relship/RandomGenerator_impl.cc
Bug fix of my previous fix. Method RandomGenerator_impl::rand()
should check for 'proxy' mode only if check for 'generate' mode  
failed.


--- RandomGenerator_impl.cc 20 Feb 2008 15:22:25 -  1.1
+++ RandomGenerator_impl.cc 5 Jan 2009 21:54:21 -   1.2
@@ -42,9 +42,10 @@
 RandomGenerator_impl::rand ()
 {
   CORBA::Long number;
-  if (mode == RandomGenerator::generate)
+  if (mode == RandomGenerator::generate) {
 number = ::rand ();
-  if (mode == RandomGenerator::proxy) {
+  }
+  else if (mode == RandomGenerator::proxy) {
 if (!random_numbers.empty ()) {
   number = *(random_numbers.begin ());
   random_numbers.pop_front ();
@@ -53,8 +54,12 @@
   //::RandomGenerator::NoSuchNumber exception;
   //throw exception;
   mico_throw (RandomGenerator::NoSuchNumber());
+  number = 0; // Avoid compiler warnings
 }
   }
+  else {
+number = 0; // Should never happen. Exception?
+  }

   return number;
 }


3. ROADMAP
'imr' is not a directory under micos devel root. Instead it is  
part

of directory 'daemon'.


--- ROADMAP 20 Feb 2008 15:22:05 -  1.1
+++ ROADMAP 5 Jan 2009 21:56:10 -   1.2
@@ -7,10 +7,10 @@
 coss-- CORBA Services, only naming service at the moment.  
libmicocoss is

built in this directory.
 daemon  -- BOA daemon (micod).
+   imr - implementation repository and admin tool (imr).
 demo-- some examples.
 doc -- documentation.
 idl -- idl compiler (idl).
-imr -- implementation repository and admin tool (imr).
 include -- include files.
 ir  -- interface repository and IR server (ird).
 man -- unix manual pages.
mic
--
Thomas Schmidt
Schneiderstr. 16
D-29575 Altenmedingen
Phone: +49-5807-209976
Cellular: +49-172-3011505
Skype: ThCSchmidt
Email: 01723011...@vodafone.de
PGP: Key-ID: 0x810B6206

___
Mico-devel mailing list
Mico-devel@mico.org
http://www.mico.org/mailman/listinfo/mico-devel