summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2007-04-02 15:11:35 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2007-04-02 15:11:35 +0000
commitf3b0bfcf8c096cc3ff947e722e12d6127aec6232 (patch)
tree8ce988b89443b469acf06b0fdc805e6dbade2a95
parentc095bcda01af6064296961cf8c22f4c22fc366ef (diff)
downloadATCD-f3b0bfcf8c096cc3ff947e722e12d6127aec6232.tar.gz
ChangeLogTag: Mon Apr 2 15:11:24 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--ACE/ACEXML/apps/svcconf/Svcconf.cpp4
-rw-r--r--ACE/ChangeLog7
2 files changed, 11 insertions, 0 deletions
diff --git a/ACE/ACEXML/apps/svcconf/Svcconf.cpp b/ACE/ACEXML/apps/svcconf/Svcconf.cpp
index 482970b1515..7fd69046ec3 100644
--- a/ACE/ACEXML/apps/svcconf/Svcconf.cpp
+++ b/ACE/ACEXML/apps/svcconf/Svcconf.cpp
@@ -101,6 +101,10 @@ ACEXML_Svcconf_Parser::parse_string (const ACE_TCHAR str[])
}
ACEXML_CATCH (ACEXML_SAXException, ex)
{
+ // If there was a problem parsing the stream, set the errno
+ // to EINVAL to indicate to upper levels that the stream was
+ // invalid.
+ ACE_OS::last_error (EINVAL);
ex.print ();
return -1;
}
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 96b57b1846e..c471b213fdf 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Mon Apr 2 15:11:24 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
+
+ * ACEXML/apps/svcconf/Svcconf.cpp:
+
+ As part of the fixes for Bug 2735, we must set errno to EINVAL
+ when a directive fails to parse.
+
Mon Apr 2 15:02:26 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
* ace/Service_Object.cpp: