[java-identity-provider COMMIT] in /trunk: idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServi...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Nov 24 09:37:17 2014
New Revision: 7000

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7000&view=rev
Log:
Switch an error event.

Modified:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServiceConfiguration.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/ReloadMetadata.java

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServiceConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServiceConfiguration.java?rev=7000&r1=6999&r2=7000&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServiceConfiguration.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServiceConfiguration.java Mon Nov 24 09:37:17 2014
@@ -52,9 +52,9 @@
  * HTTP status is returned.</p>
  * 
  * @event {@link EventIds#PROCEED_EVENT_ID}
+ * @event {@link EventIds#INVALID_MESSAGE}
  * @event {@link EventIds#INVALID_PROFILE_CTX}
  * @event {@link EventIds#IO_ERROR}
- * @event {@link EventIds#UNABLE_TO_DECODE}
  */
 public class ReloadServiceConfiguration extends AbstractProfileAction {
     
@@ -153,14 +153,14 @@
 
             if (getHttpServletRequest() == null) {
                 log.debug("{} HttpServletRequest not found", getLogPrefix());
-                ActionSupport.buildEvent(input, EventIds.UNABLE_TO_DECODE);
+                ActionSupport.buildEvent(input, EventIds.INVALID_PROFILE_CTX);
                 return null;
             }
             
             final String id = StringSupport.trimOrNull(getHttpServletRequest().getParameter(SERVICE_ID));
             if (id == null) {
                 log.debug("{} No 'id' parameter found in request", getLogPrefix());
-                ActionSupport.buildEvent(input, EventIds.UNABLE_TO_DECODE);
+                ActionSupport.buildEvent(input, EventIds.INVALID_MESSAGE);
                 return null;
             }
             

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/ReloadMetadata.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/ReloadMetadata.java?rev=7000&r1=6999&r2=7000&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/ReloadMetadata.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/ReloadMetadata.java Mon Nov 24 09:37:17 2014
@@ -53,9 +53,9 @@
  * HTTP status is returned.</p>
  * 
  * @event {@link EventIds#PROCEED_EVENT_ID}
+ * @event {@link EventIds#INVALID_MESSAGE}
  * @event {@link EventIds#INVALID_PROFILE_CTX}
  * @event {@link EventIds#IO_ERROR}
- * @event {@link EventIds#UNABLE_TO_DECODE}
  */
 public class ReloadMetadata extends AbstractProfileAction {
 
@@ -105,7 +105,7 @@
         id = getHttpServletRequest() != null ? getHttpServletRequest().getParameter(RESOLVER_ID) : null;
         if (id == null) {
             log.debug("{} No 'id' parameter found in request", getLogPrefix());
-            ActionSupport.buildEvent(profileRequestContext, EventIds.UNABLE_TO_DECODE);
+            ActionSupport.buildEvent(profileRequestContext, EventIds.INVALID_MESSAGE);
             return false;
         }