[mapguide-commits] r7765 - in branches/2.5/MgDev: Server/src/Common/Manager Web/src/ApacheAgent Web/src/CgiAgent Web/src/IsapiAgent Web/src/mapviewerjava Web/src/mapviewernet
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Aug 14 04:57:59 PDT 2013
Author: jng
Date: 2013-08-14 04:57:59 -0700 (Wed, 14 Aug 2013)
New Revision: 7765
Modified:
branches/2.5/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp
branches/2.5/MgDev/Web/src/ApacheAgent/ApacheResponseHandler.cpp
branches/2.5/MgDev/Web/src/CgiAgent/CgiResponseHandler.cpp
branches/2.5/MgDev/Web/src/IsapiAgent/IsapiResponseHandler.cpp
branches/2.5/MgDev/Web/src/mapviewerjava/serveradminhelper.jsp
branches/2.5/MgDev/Web/src/mapviewernet/serveradminhelper.aspx
Log:
#2261: A review of the codebase where calls to MgException::GetDetails() were made found these areas where redundant information was saved/written/kogged. GetDetails() is the *full* message/stack/etc, so anything else saved/written/logged out is redundant. Such bits of code have been removed.
Modified: branches/2.5/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp
===================================================================
--- branches/2.5/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp 2013-08-14 11:37:17 UTC (rev 7764)
+++ branches/2.5/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp 2013-08-14 11:57:59 UTC (rev 7765)
@@ -356,8 +356,6 @@
MgResources::DefaultMessageLocale : serverManager->GetDefaultMessageLocale();
STRING message = ex->GetDetails(locale);
- message += L"\n";
- message += ex->GetStackTrace(locale);
MgStringCollection args;
args.Add(resourceIdentifier->ToString());
args.Add(message);
Modified: branches/2.5/MgDev/Web/src/ApacheAgent/ApacheResponseHandler.cpp
===================================================================
--- branches/2.5/MgDev/Web/src/ApacheAgent/ApacheResponseHandler.cpp 2013-08-14 11:37:17 UTC (rev 7764)
+++ branches/2.5/MgDev/Web/src/ApacheAgent/ApacheResponseHandler.cpp 2013-08-14 11:57:59 UTC (rev 7765)
@@ -179,7 +179,7 @@
{
MG_TRY()
STRING shortError = e->GetExceptionMessage();
- STRING longError = e->GetDetails();
+ STRING stackTrace = e->GetStackTrace();
STRING statusMessage = e->GetClassName();
//TODO: Use a string resource for html error text format
@@ -200,7 +200,7 @@
"<body>\n<h2>%s</h2>\n%s\n</body>\n</html>\n",
MG_WCHAR_TO_CHAR(statusMessage),
MG_WCHAR_TO_CHAR(shortError),
- MG_WCHAR_TO_CHAR(longError));
+ MG_WCHAR_TO_CHAR(stackTrace));
MG_CATCH(L"ApacheResponseHandler.SendError")
Modified: branches/2.5/MgDev/Web/src/CgiAgent/CgiResponseHandler.cpp
===================================================================
--- branches/2.5/MgDev/Web/src/CgiAgent/CgiResponseHandler.cpp 2013-08-14 11:37:17 UTC (rev 7764)
+++ branches/2.5/MgDev/Web/src/CgiAgent/CgiResponseHandler.cpp 2013-08-14 11:57:59 UTC (rev 7765)
@@ -178,8 +178,9 @@
{
MG_TRY()
STRING shortError = e->GetExceptionMessage();
+ STRING stackTrace = e->GetStackTrace();
+ STRING statusMessage = e->GetClassName();
STRING longError = e->GetDetails();
- STRING statusMessage = e->GetClassName();
//TODO: Use a string resource for html error text format
printf(MapAgentStrings::StatusHeader, 559, MG_WCHAR_TO_CHAR(statusMessage));
@@ -192,7 +193,7 @@
"<body>\n<h2>%s</h2>\n%s\n</body>\n</html>\n",
MG_WCHAR_TO_CHAR(statusMessage),
MG_WCHAR_TO_CHAR(shortError),
- MG_WCHAR_TO_CHAR(longError));
+ MG_WCHAR_TO_CHAR(stackTrace));
DumpMessage(MG_WCHAR_TO_CHAR(longError));
Modified: branches/2.5/MgDev/Web/src/IsapiAgent/IsapiResponseHandler.cpp
===================================================================
--- branches/2.5/MgDev/Web/src/IsapiAgent/IsapiResponseHandler.cpp 2013-08-14 11:37:17 UTC (rev 7764)
+++ branches/2.5/MgDev/Web/src/IsapiAgent/IsapiResponseHandler.cpp 2013-08-14 11:57:59 UTC (rev 7765)
@@ -192,7 +192,7 @@
{
MG_TRY()
STRING shortError = e->GetExceptionMessage();
- STRING longError = e->GetDetails();
+ STRING stackTrace = e->GetStackTrace();
STRING statusMessage = e->GetClassName();
DWORD status = 559;
@@ -217,7 +217,7 @@
"<body>\n<h2>%s</h2>\n%s\n</body>\n</html>\n",
MG_WCHAR_TO_CHAR(statusMessage),
MG_WCHAR_TO_CHAR(shortError),
- MG_WCHAR_TO_CHAR(longError));
+ MG_WCHAR_TO_CHAR(stackTrace));
MG_CATCH(L"IsapiResponseHandler.SendError")
Modified: branches/2.5/MgDev/Web/src/mapviewerjava/serveradminhelper.jsp
===================================================================
--- branches/2.5/MgDev/Web/src/mapviewerjava/serveradminhelper.jsp 2013-08-14 11:37:17 UTC (rev 7764)
+++ branches/2.5/MgDev/Web/src/mapviewerjava/serveradminhelper.jsp 2013-08-14 11:57:59 UTC (rev 7765)
@@ -142,7 +142,6 @@
}
catch (MgException mge)
{
- outStream.write(mge.GetExceptionMessage());
outStream.write(mge.GetDetails());
}
Modified: branches/2.5/MgDev/Web/src/mapviewernet/serveradminhelper.aspx
===================================================================
--- branches/2.5/MgDev/Web/src/mapviewernet/serveradminhelper.aspx 2013-08-14 11:37:17 UTC (rev 7764)
+++ branches/2.5/MgDev/Web/src/mapviewernet/serveradminhelper.aspx 2013-08-14 11:57:59 UTC (rev 7765)
@@ -130,7 +130,6 @@
}
catch (MgException mge)
{
- Response.Write(mge.GetExceptionMessage());
Response.Write(mge.GetDetails());
}
}
More information about the mapguide-commits
mailing list