OSDN Git Service

Ticket#429対応の修正(DHA)
authormorisita <morisita@1ed66053-1c2d-0410-8867-f7571e6e31d3>
Wed, 13 Jan 2010 04:29:22 +0000 (04:29 +0000)
committermorisita <morisita@1ed66053-1c2d-0410-8867-f7571e6e31d3>
Wed, 13 Jan 2010 04:29:22 +0000 (04:29 +0000)
git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel@9696 1ed66053-1c2d-0410-8867-f7571e6e31d3

l7vsd/module/protocol/protocol_module_ip.cpp
l7vsd/module/protocol/protocol_module_sslid.cpp

index f3a88e2..c94728a 100644 (file)
@@ -995,36 +995,38 @@ namespace l7vs
             }
             /*------DEBUG LOG END------*/
 
-            replication_area_lock();
-
-            /*-------- DEBUG LOG --------*/
-            if (unlikely(LOG_LV_DEBUG == getloglevel()))
+            if (data_addr)
             {
-                putLogDebug(600027, "function : protocol_module_ip::check_message_result protocol_module_ip::"
-                            "set_parameter() : replication_area_lock() end.", __FILE__, __LINE__);
-            }
-            /*------DEBUG LOG END------*/
+                replication_area_lock();
 
-            ip_data_processor->read_session_data_from_replication_area(redata);
+                /*-------- DEBUG LOG --------*/
+                if (unlikely(LOG_LV_DEBUG == getloglevel()))
+                {
+                    putLogDebug(600027, "function : protocol_module_ip::check_message_result protocol_module_ip::"
+                                "set_parameter() : replication_area_lock() end.", __FILE__, __LINE__);
+                }
+                /*------DEBUG LOG END------*/
 
-            /*-------- DEBUG LOG --------*/
-            if (unlikely(LOG_LV_DEBUG == getloglevel()))
-            {
-                putLogDebug(600028, "function : protocol_module_ip::check_message_result protocol_module_ip::"
-                            "set_parameter() : read_session_data_from_replication_area() end.", __FILE__, __LINE__);
-            }
-            /*------DEBUG LOG END------*/
+                ip_data_processor->read_session_data_from_replication_area(redata);
 
-            replication_area_unlock();
+                /*-------- DEBUG LOG --------*/
+                if (unlikely(LOG_LV_DEBUG == getloglevel()))
+                {
+                    putLogDebug(600028, "function : protocol_module_ip::check_message_result protocol_module_ip::"
+                                "set_parameter() : read_session_data_from_replication_area() end.", __FILE__, __LINE__);
+                }
+                /*------DEBUG LOG END------*/
 
-            /*-------- DEBUG LOG --------*/
-            if (unlikely(LOG_LV_DEBUG == getloglevel()))
-            {
-                putLogDebug(600029, "function : protocol_module_ip::check_message_result protocol_module_ip::"
-                            "set_parameter() : replication_area_unlock() end.", __FILE__, __LINE__);
+                replication_area_unlock();
+            
+                /*-------- DEBUG LOG --------*/
+                if (unlikely(LOG_LV_DEBUG == getloglevel()))
+                {
+                    putLogDebug(600029, "function : protocol_module_ip::check_message_result protocol_module_ip::"
+                                "set_parameter() : replication_area_unlock() end.", __FILE__, __LINE__);
+                }
+                /*------DEBUG LOG END------*/
             }
-            /*------DEBUG LOG END------*/
-
         }
         catch (const std::bad_alloc& ba)
         {
index d74d730..161d3bd 100644 (file)
@@ -834,32 +834,35 @@ protocol_module_sslid::check_message_result protocol_module_sslid::set_parameter
         }
         /*------DEBUG LOG END------*/
 
-        replication_area_lock();
-        /*-------- DEBUG LOG --------*/
-        if (unlikely(LOG_LV_DEBUG == getloglevel()))
+        if (data_addr)
         {
-            putLogDebug(300024, "function : protocol_module_sslid::check_message_result protocol_module_sslid::"
-                        "set_parameter() : replication_area_lock() end.", __FILE__, __LINE__);
-        }
-        /*------DEBUG LOG END------*/
+            replication_area_lock();
+            /*-------- DEBUG LOG --------*/
+            if (unlikely(LOG_LV_DEBUG == getloglevel()))
+            {
+                putLogDebug(300024, "function : protocol_module_sslid::check_message_result protocol_module_sslid::"
+                            "set_parameter() : replication_area_lock() end.", __FILE__, __LINE__);
+            }
+            /*------DEBUG LOG END------*/
 
-        session_data_processor->read_session_data_from_replication_area(redata);
-        /*-------- DEBUG LOG --------*/
-        if (unlikely(LOG_LV_DEBUG == getloglevel()))
-        {
-            putLogDebug(300025, "function : protocol_module_sslid::check_message_result protocol_module_sslid::"
-                        "set_parameter() : read_session_data_from_replication_area() end.", __FILE__, __LINE__);
-        }
-        /*------DEBUG LOG END------*/
+            session_data_processor->read_session_data_from_replication_area(redata);
+            /*-------- DEBUG LOG --------*/
+            if (unlikely(LOG_LV_DEBUG == getloglevel()))
+            {
+                putLogDebug(300025, "function : protocol_module_sslid::check_message_result protocol_module_sslid::"
+                            "set_parameter() : read_session_data_from_replication_area() end.", __FILE__, __LINE__);
+            }
+            /*------DEBUG LOG END------*/
 
-        replication_area_unlock();
-        /*-------- DEBUG LOG --------*/
-        if (unlikely(LOG_LV_DEBUG == getloglevel()))
-        {
-            putLogDebug(300026, "function : protocol_module_sslid::check_message_result protocol_module_sslid::"
-                        "set_parameter() : replication_area_unlock() end.", __FILE__, __LINE__);
+            replication_area_unlock();
+            /*-------- DEBUG LOG --------*/
+            if (unlikely(LOG_LV_DEBUG == getloglevel()))
+            {
+                putLogDebug(300026, "function : protocol_module_sslid::check_message_result protocol_module_sslid::"
+                            "set_parameter() : replication_area_unlock() end.", __FILE__, __LINE__);
+            }
+            /*------DEBUG LOG END------*/
         }
-        /*------DEBUG LOG END------*/
     }
     catch (const std::bad_alloc& ba)
     {