Changeset 10565

Timestamp:

Aug 30, 2015, 2:36:27 PM (9 years ago)

Author:

landauf

Message:

fixed mapping of FunctionIDs - same reason like for ClassIDs in r10564

Location:

code/branches/core7/src/libraries/network

Files:

• FunctionCall.cc (modified) (1 diff)
• NetworkFunction.cc (modified) (1 diff)
• NetworkFunctionManager.cc (modified) (1 diff)
• NetworkFunctionManager.h (modified) (1 diff)
• packet/FunctionIDs.cc (modified) (1 diff)

code/branches/core7/src/libraries/network/FunctionCall.cc

@@ -47 +47 @@
 
 bool FunctionCall::execute(){
-  NetworkFunctionBase* fct = static_cast<NetworkFunctionStatic*>(NetworkFunctionManager::getInstance().getFunctionByNetworkId( this->functionID_ ));
+  NetworkFunctionBase* fct = NetworkFunctionManager::getInstance().getFunctionByNetworkId( this->functionID_ );
+  assert( fct != NULL );
   assert( this->nrOfArguments_==this->arguments_.size() );
   switch(this->nrOfArguments_)

code/branches/core7/src/libraries/network/NetworkFunction.cc

@@ -42 +42 @@
     void NetworkFunctionBase::setNetworkID(uint32_t id)
     {
-        NetworkFunctionManager::getInstance().unregisterFunction(this); // unregister with old id
         this->networkID_ = id;
         NetworkFunctionManager::getInstance().registerFunction(this);   // register with new id

code/branches/core7/src/libraries/network/NetworkFunctionManager.cc

@@ -68 +68 @@
         std::map<uint32_t, NetworkFunctionBase*>::iterator it = idMap_.find(id);
         assert(it != idMap_.end());
-        return it->second;
+        if(it != idMap_.end())
+            return it->second;
+        else
+            return NULL;
+    }
+
+    /**
+        @brief Cleans the NetworkID map (needed on clients for correct initialization)
+    */
+    void NetworkFunctionManager::clearNetworkIDs()
+    {
+        this->idMap_.clear();
     }
 }

code/branches/core7/src/libraries/network/NetworkFunctionManager.h

@@ -56 +56 @@
             NetworkFunctionBase* getFunctionByNetworkId(uint32_t id);
 
+            void clearNetworkIDs();
+
         private:
             std::set<NetworkFunctionBase*> functions_;

code/branches/core7/src/libraries/network/packet/FunctionIDs.cc

@@ -128 +128 @@
   unsigned char *functionname;
 
+  //clear the map of network ids
+  NetworkFunctionManager::getInstance().clearNetworkIDs();
+
   orxout(verbose, context::packets) << "=== processing functionids: " << endl;
   std::pair<uint32_t, std::string> tempPair;