[jboss-cvs] jboss-seam/src/main/org/jboss/seam/interceptors ...

[Gavin King]

  User: gavin   
  Date: 06/09/27 15:56:09

  Modified:    src/main/org/jboss/seam/interceptors 
                        ExceptionInterceptor.java
  Log:
  fix npe
  
  Revision  Changes    Path
  1.7       +16 -5     jboss-seam/src/main/org/jboss/seam/interceptors/ExceptionInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ExceptionInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/ExceptionInterceptor.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- ExceptionInterceptor.java	28 Jul 2006 00:46:30 -0000	1.6
  +++ ExceptionInterceptor.java	27 Sep 2006 19:56:09 -0000	1.7
  @@ -1,4 +1,4 @@
  -//$Id: ExceptionInterceptor.java,v 1.6 2006/07/28 00:46:30 gavin Exp $
  +//$Id: ExceptionInterceptor.java,v 1.7 2006/09/27 19:56:09 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.util.Map;
  @@ -88,13 +88,17 @@
   
      private void addFacesMessage(Exception e, String message)
      {
  -      FacesMessages.instance().add( renderExceptionMessage(e, message) );
  +      message = renderExceptionMessage(e, message);
  +      if (message!=null)
  +      {
  +         FacesMessages.instance().add(message);
  +      }
      }
      
      private String renderExceptionMessage(Exception e, String message)
      {
  -      return Interpolator.instance()
  -            .interpolate( "".equals(message) ? e.getMessage() : message );
  +      message = "".equals(message) ? e.getMessage() : message;
  +      return message==null ? null : Interpolator.instance().interpolate(message);
      }
   
      private void error(int code, String message)
  @@ -102,7 +106,14 @@
         if ( log.isDebugEnabled() ) log.debug("sending error: " + code);
         FacesContext facesContext = FacesContext.getCurrentInstance();
         org.jboss.seam.core.HttpError httpError = org.jboss.seam.core.HttpError.instance();
  +      if (message==null)
  +      {
  +         httpError.send(code);
  +      }
  +      else
  +      {
         httpError.send(code, message);
  +      }
         FacesMessages.afterPhase();
         AbstractSeamPhaseListener.storeAnyConversationContext(facesContext);
      }