1 files changed, 8 insertions, 12 deletions
diff --git a/TAO/CIAO/tools/Config_Handlers/Any_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Any_Handler.cpp
index e14838e9a9a..535d5a88d8a 100644
--- a/TAO/CIAO/tools/Config_Handlers/Any_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Any_Handler.cpp
@@ -6,7 +6,7 @@
 #include "DataType_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "tao/AnyTypeCode/Any.h"
-
+#include "ciao/CIAO_common.h"
 #include "DynAny_Handler/DynAny_Handler.h"
 
 namespace CIAO
@@ -27,24 +27,20 @@ namespace CIAO
                                    CORBA::Any& toconfig)
 
     {
+      CIAO_TRACE("Any_Handler::extract_into_any");
       DynamicAny::DynAny_var dyn = DYNANY_HANDLER->extract_into_dynany (desc.type (),
-                                                 desc.value ());
-      
+                                                                        desc.value ());
+
       toconfig = *dyn->to_any ();
-      
+
       dyn->destroy ();
     }
 
     Any Any_Handler::get_any (const ::CORBA::Any& src)
     {
-      //MAJO
-      //@Bala ... still haven't figured this one out yet
-      //I was saving it for last...going from corba::any
-      //to xsc DataValue
-      DataType type = DataType_Handler::data_type (src.type ());
-      DataValue value;
-      Any any (type,value);
-      return any;
+      CIAO_TRACE("Any_Handler::extract_into_any - reverse");
+
+      return DYNANY_HANDLER->extract_from_dynany (src);
     }
   }
 }