[cpp-sp COMMIT] /branches/REL_2/shibsp/handler/impl/StatusHandler.cpp

[noreply at shibboleth.net]

Author: scantor
Date: Wed Sep 21 18:12:06 2011
New Revision: 3519

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3519&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-362

Modified:
    branches/REL_2/shibsp/handler/impl/StatusHandler.cpp

Modified: branches/REL_2/shibsp/handler/impl/StatusHandler.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/handler/impl/StatusHandler.cpp?rev=3519&r1=3518&r2=3519&view=diff
==============================================================================
--- branches/REL_2/shibsp/handler/impl/StatusHandler.cpp (original)
+++ branches/REL_2/shibsp/handler/impl/StatusHandler.cpp Wed Sep 21 18:12:06 2011
@@ -181,7 +181,7 @@
             }
         }
 
-        ~DummyRequest() {
+        virtual ~DummyRequest() {
             delete m_parser;
         }
 
@@ -451,18 +451,19 @@
             status = "<Partial/>";
         }
 
+        MetadataProvider* m = application.getMetadataProvider();
+        Locker mlock(m);
+
         const PropertySet* relyingParty=nullptr;
         param=httpRequest.getParameter("entityID");
-        if (param) {
-            MetadataProvider* m = application.getMetadataProvider();
-            Locker mlock(m);
+        if (param)
             relyingParty = application.getRelyingParty(m->getEntityDescriptor(MetadataProviderCriteria(application, param)).first);
-        }
-        else {
+        else
             relyingParty = &application;
-        }
 
         s << "<Application id='" << application.getId() << "' entityID='" << relyingParty->getString("entityID").second << "'/>";
+
+        m->outputStatus(s);
 
         s << "<Handlers>";
         vector<const Handler*> handlers;