diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-05-14 10:22:18 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-05-14 10:22:18 +0000 |
| commit | 3ac4732c893b14a04c80df3b1193824e7c050695 (patch) | |
| tree | 1303b22946e18aea4b802ac04fa26e3eb8ae6922 /TAO/tao/Strategies | |
| parent | 537c21f877db4a432c6d8b1b6df125c97fa752bd (diff) | |
| download | ATCD-3ac4732c893b14a04c80df3b1193824e7c050695.tar.gz | |
Mon May 14 10:21:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/Strategies')
| -rw-r--r-- | TAO/tao/Strategies/COIOP_Acceptor.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/Strategies/DIOP_Acceptor.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/Strategies/SHMIOP_Acceptor.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/Strategies/UIOP_Acceptor.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/TAO/tao/Strategies/COIOP_Acceptor.cpp b/TAO/tao/Strategies/COIOP_Acceptor.cpp index c71ad7761e7..3b3d3d88e28 100644 --- a/TAO/tao/Strategies/COIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/COIOP_Acceptor.cpp @@ -343,6 +343,8 @@ TAO_COIOP_Acceptor::parse_options (const char *str) ACE_CString name = opt.substring (0, slot); ACE_CString value = opt.substring (slot + 1); + begin = end + 1; + if (name.length () == 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Zero length COIOP ") @@ -363,8 +365,6 @@ TAO_COIOP_Acceptor::parse_options (const char *str) ACE_TEXT_CHAR_TO_TCHAR (name.c_str ())), -1); } - - begin = end + 1; } else { diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp index d60634a8a0d..a1eaa668609 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp @@ -727,6 +727,8 @@ TAO_DIOP_Acceptor::parse_options (const char *str) ACE_CString name = opt.substring (0, slot); ACE_CString value = opt.substring (slot + 1); + begin = end + 1; + if (name.length () == 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Zero length DIOP ") @@ -747,8 +749,6 @@ TAO_DIOP_Acceptor::parse_options (const char *str) ACE_TEXT_CHAR_TO_TCHAR (name.c_str ())), -1); } - - begin = end + 1; } else { diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp index 162f0f88e88..5227669b74b 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp @@ -470,6 +470,8 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str) ACE_CString name = opt.substring (0, slot); ACE_CString value = opt.substring (slot + 1); + begin = end + 1; + if (name.length () == 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Zero length SHMIOP ") @@ -488,8 +490,6 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str) ACE_TEXT ("TAO (%P|%t) Invalid SHMIOP option: <%s>\n"), ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())), -1); - - begin = end + 1; } else break; // No other options. diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp index 790094e03a1..d668a3ee78a 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp @@ -454,6 +454,8 @@ TAO_UIOP_Acceptor::parse_options (const char *str) const ACE_CString name (opt.substring (0, slot)); ACE_CString value = opt.substring (slot + 1); + begin = end + 1; + if (name.length () == 0) ACE_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) Zero length UIOP " @@ -472,8 +474,6 @@ TAO_UIOP_Acceptor::parse_options (const char *str) "TAO (%P|%t) Invalid UIOP option: <%s>\n", name.c_str ()), -1); - - begin = end + 1; } else break; // No other options. |