svn commit: r662214 - in /activemq/activemq-cpp/trunk/src/main/activemq: connector/openwire/marshal/PrimitiveMapMarshaller.cpp util/PrimitiveValueNode.cpp

[tabish]

Author: tabish
Date: Sun Jun  1 06:55:05 2008
New Revision: 662214

URL: http://svn.apache.org/viewvc?rev=662214&view=rev
Log: (empty)

Modified:
    
activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/util/PrimitiveValueNode.cpp

Modified: 
activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp
URL: 
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp?rev=662214&r1=662213&r2=662214&view=diff
==============================================================================
--- 
activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp
 (original)
+++ 
activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp
 Sun Jun  1 06:55:05 2008
@@ -48,9 +48,7 @@
         if( map == NULL ) {
             dataOut.writeInt( -1 );
         } else {
-            std::cout << std::endl << "Begin Marshalling" << std::endl;
             PrimitiveMapMarshaller::marshalPrimitiveMap( dataOut, *map );
-            std::cout << std::endl << "End Marshalling" << std::endl;
         }
     }
     AMQ_CATCH_RETHROW( ActiveMQException )

Modified: 
activemq/activemq-cpp/trunk/src/main/activemq/util/PrimitiveValueNode.cpp
URL: 
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/util/PrimitiveValueNode.cpp?rev=662214&r1=662213&r2=662214&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/util/PrimitiveValueNode.cpp 
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/util/PrimitiveValueNode.cpp 
Sun Jun  1 06:55:05 2008
@@ -32,60 +32,69 @@
 
 
////////////////////////////////////////////////////////////////////////////////
 PrimitiveValueNode::PrimitiveValueNode( bool value ) {
+    this->valueType = NULL_TYPE;
     this->setBool( value );
 }
 
 
////////////////////////////////////////////////////////////////////////////////
 PrimitiveValueNode::PrimitiveValueNode( unsigned char value ) {
+    this->valueType = NULL_TYPE;
     this->setByte( value );
 }
 
 
////////////////////////////////////////////////////////////////////////////////
 PrimitiveValueNode::PrimitiveValueNode( char value ) {
+    this->valueType = NULL_TYPE;
     this->setChar( value );
 }
 
 
////////////////////////////////////////////////////////////////////////////////
 PrimitiveValueNode::PrimitiveValueNode( short value ) {
+    this->valueType = NULL_TYPE;
     this->setShort( value );
 }
 
 
////////////////////////////////////////////////////////////////////////////////
 PrimitiveValueNode::PrimitiveValueNode( int value ) {
+    this->valueType = NULL_TYPE;
     this->setInt( value );
 }
 
 
////////////////////////////////////////////////////////////////////////////////
 PrimitiveValueNode::PrimitiveValueNode( long long value ) {
+    this->valueType = NULL_TYPE;
     this->setLong( value );
 }
 
 
////////////////////////////////////////////////////////////////////////////////
 PrimitiveValueNode::PrimitiveValueNode( float value ) {
+    this->valueType = NULL_TYPE;
     this->setFloat( value );
 }
 
 
////////////////////////////////////////////////////////////////////////////////
 PrimitiveValueNode::PrimitiveValueNode( double value ) {
+    this->valueType = NULL_TYPE;
     this->setDouble( value );
 }
 
 
////////////////////////////////////////////////////////////////////////////////
 PrimitiveValueNode::PrimitiveValueNode( const char* value ) {
-    if( value == NULL ) {
-        clear();
-    } else {
+    this->valueType = NULL_TYPE;
+    if( value != NULL ) {
         this->setString( string( value ) );
     }
 }
 
 
////////////////////////////////////////////////////////////////////////////////
 PrimitiveValueNode::PrimitiveValueNode( const std::string& value ) {
+    this->valueType = NULL_TYPE;
     this->setString( value );
 }
 
 
////////////////////////////////////////////////////////////////////////////////
 PrimitiveValueNode::PrimitiveValueNode( const std::vector<unsigned char>& 
value ) {
+    this->valueType = NULL_TYPE;
     this->setByteArray( value );
 }
 
@@ -93,6 +102,7 @@
 PrimitiveValueNode::PrimitiveValueNode(
     const decaf::util::List<PrimitiveValueNode>& value ) {
 
+    this->valueType = NULL_TYPE;
     this->setList( value );
 }
 
@@ -100,13 +110,13 @@
 PrimitiveValueNode::PrimitiveValueNode(
     const decaf::util::Map<std::string, PrimitiveValueNode>& value ) {
 
+    this->valueType = NULL_TYPE;
     this->setMap( value );
 }
 
 
////////////////////////////////////////////////////////////////////////////////
 PrimitiveValueNode::PrimitiveValueNode( const PrimitiveValueNode& node ){
     valueType = NULL_TYPE;
-    memset( &value, 0, sizeof(value) );
     (*this) = node;
 }