[java-identity-provider COMMIT] in /trunk/idp-core/src/main/java/net/shibboleth/idp/service: AbstractReloadableServic...

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Feb 28 02:03:25 2013
New Revision: 4290

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4290&view=rev
Log:
Actually start the performance event, otherwise an illegal state exception is thrown when it is stopped.

Modified:
    trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractReloadableService.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractService.java

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractReloadableService.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractReloadableService.java?rev=4290&r1=4289&r2=4290&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractReloadableService.java (original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractReloadableService.java Thu Feb 28 02:03:25 2013
@@ -133,7 +133,7 @@
     /** {@inheritDoc} */
     protected void doInitialize() throws ComponentInitializationException {
         super.doInitialize();
-        
+
         if (reloadCheckDelay > 0) {
             Constraint.isNotNull(reloadTaskTimer, "Reload task timer cannot be null");
             reloadTask = new ServiceReloadTask();
@@ -151,6 +151,7 @@
      */
     public final void reload() {
         final PerformanceEvent perfEvent = new PerformanceEvent(getId() + ".reload");
+        perfEvent.startTime();
 
         final Lock serviceWriteLock = getServiceLock().writeLock();
         final HashMap context = new HashMap();

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractService.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractService.java?rev=4290&r1=4289&r2=4290&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractService.java (original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractService.java Thu Feb 28 02:03:25 2013
@@ -95,6 +95,7 @@
      */
     public final void start() throws ServiceException {
         final PerformanceEvent perfEvent = new PerformanceEvent(getId() + START_PERF_EVENT_ID_SUFFIX);
+        perfEvent.startTime();
 
         final Lock serviceWriteLock = getServiceLock().writeLock();
         final HashMap context = new HashMap();
@@ -135,6 +136,7 @@
      */
     public final void stop() throws ServiceException {
         final PerformanceEvent perfEvent = new PerformanceEvent(getId() + STOP_PERF_EVENT_ID_SUFFIX);
+        perfEvent.startTime();
 
         final Lock serviceWriteLock = getServiceLock().writeLock();
         final HashMap context = new HashMap();