Thu Aug 16 11:42:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 16 insertions, 5 deletions

diff --git a/TAO/tao/Object_Reference_Sequence_Element_T.h b/TAO/tao/Object_Reference_Sequence_Element_T.h
index 5c7f1f6f4ce..ba9c656b865 100644
--- a/TAO/tao/Object_Reference_Sequence_Element_T.h
+++ b/TAO/tao/Object_Reference_Sequence_Element_T.h
@@ -81,18 +81,22 @@ public:
 
   inline operator value_type()
   {
-    return *element_;
+    return *this->element_;
   }
 
   inline operator const_value_type() const
   {
-    return *element_;
+    return *this->element_;
   }
 
   inline object_reference_type *in (void) const {
     return *this->element_;
   }
 
+  inline object_reference_type *&inout (void) const {
+    return *this->element_;
+  }
+
   inline value_type operator->()
   {
     return *this->element_;
diff --git a/TAO/tao/Transport_Cache_Manager.cpp b/TAO/tao/Transport_Cache_Manager.cpp
index 1410e7917ff..0534ecb7fff 100644
--- a/TAO/tao/Transport_Cache_Manager.cpp
+++ b/TAO/tao/Transport_Cache_Manager.cpp
@@ -75,7 +75,7 @@ namespace TAO
        {
          ACE_DEBUG ((LM_INFO,
             ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager::bind_i: ")
-            ACE_TEXT (" Transport[%d] @ hash:index{%d:%d}\n"),
+            ACE_TEXT ("Transport[%d] @ hash:index{%d:%d}\n"),
             int_id.transport ()->id (),
             ext_id.hash (),
             ext_id.index ()
diff --git a/TAO/tests/Bug_3042_Regression/client.cpp b/TAO/tests/Bug_3042_Regression/client.cpp
index c26637bf77e..568574dec1d 100644
--- a/TAO/tests/Bug_3042_Regression/client.cpp
+++ b/TAO/tests/Bug_3042_Regression/client.cpp
@@ -14,6 +14,7 @@ ACE_TMAIN(int, ACE_TCHAR *[])
     {
        // creation
        Foo::Node node;
+       node.nodes.length (2);
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Bug_3042_Regression/test.idl b/TAO/tests/Bug_3042_Regression/test.idl
index 0dc7ea9b602..87dcf77a171 100644
--- a/TAO/tests/Bug_3042_Regression/test.idl
+++ b/TAO/tests/Bug_3042_Regression/test.idl
@@ -15,7 +15,7 @@
 module Foo
 {
   struct Node {
-    sequence <Node,2> nodes;
+    sequence <Node,5> nodes;
   };
-  
+
 };
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index d5cc2a9d623..2bda1540d58 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -161,6 +161,11 @@ Test_DynSequence::run_test (void)
           return -1;
         }
 
+      elem_any <<= CORBA::Any::from_string ("replacement",20);
+      DynamicAny::DynAny *&io = out_elems[0].inout();
+
+      io = dynany_factory->create_dyn_any (elem_any);
+
       analyzer.analyze (fa1.in());
 
       CORBA::String_var out_str;
@@ -168,6 +173,7 @@ Test_DynSequence::run_test (void)
       for (i = 0; i < length; ++i)
         {
           out_str = out_elems[i]->get_string ();
+          ACE_DEBUG ((LM_DEBUG,"elem[%d] = %s\n", i, out_str.in()));
 
           CORBA::Boolean equal =
             out_elems[i]->equal (elements[i]);