Author: nadiramra
Date: Fri Dec 9 03:49:16 2011
New Revision: 1212238
URL: http://svn.apache.org/viewvc?rev=1212238&view=rev
Log:
Minor - More detailed tracing
Modified:
axis/axis1/c/trunk/src/soap/SoapDeSerializer.cpp
axis/axis1/c/trunk/src/xml/xerces/XMLParserXerces.cpp
Modified: axis/axis1/c/trunk/src/soap/SoapDeSerializer.cpp
URL:
http://svn.apache.org/viewvc/axis/axis1/c/trunk/src/soap/SoapDeSerializer.cpp?rev=1212238&r1=1212237&r2=1212238&view=diff
==============================================================================
--- axis/axis1/c/trunk/src/soap/SoapDeSerializer.cpp (original)
+++ axis/axis1/c/trunk/src/soap/SoapDeSerializer.cpp Fri Dec 9 03:49:16 2011
@@ -1011,47 +1011,47 @@ getCmplxObject (void *pDZFunct, void *pC
return NULL;
}
-
+
// Call the Axis-generated routine that will deserialize complex object,
// including any attributes.
- logDebugArg1("Calling object create function %p", pCreFunct)
+ logDebugArg1("Calling object create function for %s", pName)
void *pObject = ((AXIS_OBJECT_CREATE_FUNCT) pCreFunct) (0);
- logDebugArg2("Returned from object create function %p, returned object
%p", pCreFunct, pObject)
+ logDebugArg2("Returned from object create function for %s, returned object
%p", pName, pObject)
if (pObject && pDZFunct)
{
try
{
- logDebugArg1("Calling object deserializer function %p", pDZFunct)
+ logDebugArg1("Calling object deserializer function for %s", pName)
m_nStatus = ((AXIS_DESERIALIZE_FUNCT) pDZFunct) (pObject, this);
- logDebugArg2("Returned from object deserializer function %p,
status=%d", pDZFunct, m_nStatus)
+ logDebugArg2("Returned from object deserializer function for %s,
status=%d", pName, m_nStatus)
if (AXIS_SUCCESS == m_nStatus)
skipNode();
else
{
- logDebugArg2("Calling object delete function %p for object
%p", pDelFunct, pObject)
+ logDebugArg2("Calling object delete function for %s for object
%p", pName, pObject)
((AXIS_OBJECT_DELETE_FUNCT) pDelFunct) (pObject, 0);
- logDebugArg1("Returned from object delete function %p",
pDelFunct)
+ logDebugArg1("Returned from object delete function for %s",
pName)
pObject = NULL;
}
}
catch ( ... )
{
- logDebugArg2("Calling object delete function %p for object %p",
pDelFunct, pObject)
+ logDebugArg2("Calling object delete function for %s for object
%p", pName, pObject)
((AXIS_OBJECT_DELETE_FUNCT) pDelFunct) (pObject, 0);
- logDebugArg1("Returned from object delete function %p", pDelFunct)
+ logDebugArg1("Returned from object delete function for %s", pName)
logRethrowException()
Modified: axis/axis1/c/trunk/src/xml/xerces/XMLParserXerces.cpp
URL:
http://svn.apache.org/viewvc/axis/axis1/c/trunk/src/xml/xerces/XMLParserXerces.cpp?rev=1212238&r1=1212237&r2=1212238&view=diff
==============================================================================
--- axis/axis1/c/trunk/src/xml/xerces/XMLParserXerces.cpp (original)
+++ axis/axis1/c/trunk/src/xml/xerces/XMLParserXerces.cpp Fri Dec 9 03:49:16
2011
@@ -107,7 +107,7 @@ parse(bool ignoreWhitespace, bool peekIt
m_bFirstParsed = true;
if (!m_bCanParseMore)
{
- logExitWithPointer(NULL)
+ logExitWithMessage("No more data to parse.")
return (const AnyElement*)NULL;
}
@@ -171,10 +171,40 @@ parse(bool ignoreWhitespace, bool peekIt
// Set peek flag if we are doing a peek
if (peekIt)
m_bPeeked = true;
+
+ if (loggingEnabled)
+ {
+ char *type = NULL;
+ const char *elemName = "NULL";
+ if (elem->m_type == START_ELEMENT && elem->m_type2 ==
START_END_ELEMENT)
+ type = "START_END_ELEMENT";
+ else if (elem->m_type == START_ELEMENT )
+ {
+ elemName = elem->m_pchNameOrValue;
+ type = "START_ELEMENT";
+ }
+ else if (elem->m_type == END_ELEMENT )
+ {
+ elemName = elem->m_pchNameOrValue;
+ type = "END_ELEMENT";
+ }
+ else if (elem->m_type == CHARACTER_ELEMENT )
+ type = "CHARACTER_ELEMENT";
+
+ if (type)
+ {
+ logDebugArg2("Element type %s, element is=%s", type,
elemName)
+ }
+
+ }
+ }
+ else
+ {
+ logDebug("No element to return.")
}
// Return element
- logExitWithPointer(elem)
+ logExit()
return (const AnyElement*)elem;
}
@@ -223,7 +253,7 @@ parse(bool ignoreWhitespace, bool peekIt
throw AxisParseException(m_iErrorCode, m_sErrorString.c_str());
}
- logExitWithPointer(NULL)
+ logExit()
return (const AnyElement*)NULL;
}
@@ -235,7 +265,7 @@ next(bool isCharData)
const AnyElement* returnValue = parse(isCharData ? false : true);
- logExitWithPointer(returnValue)
+ logExit()
return returnValue;
}
@@ -285,7 +315,7 @@ anyNext()
// Reset prefix mapping
m_Xhandler.setGetPrefixMappings(false);
- logExitWithPointer(elem)
+ logExit()
return elem;
}
