[jBoss-Dev] CVS update: jboss/src/main/org/jboss/deploymentJ2eeDeployer.java J2eeDeploymentException.java

[jBoss CVS Development]

  User: stark   
  Date: 01/02/08 14:18:45

  Modified:    src/main/org/jboss/deployment J2eeDeployer.java
                        J2eeDeploymentException.java
  Log:
  Add RuntimeErrorException to correctly report the nested error.
  
  Revision  Changes    Path
  1.17      +7 -1      jboss/src/main/org/jboss/deployment/J2eeDeployer.java
  
  Index: J2eeDeployer.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/deployment/J2eeDeployer.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- J2eeDeployer.java 2001/02/08 22:08:37     1.16
  +++ J2eeDeployer.java 2001/02/08 22:18:44     1.17
  @@ -38,6 +38,7 @@
   import javax.management.JMException;
   import javax.management.ObjectName;
   import javax.management.RuntimeMBeanException;
  +import javax.management.RuntimeErrorException;
   
   import org.jboss.logging.Log;
   import org.jboss.util.MBeanProxy;
  @@ -64,7 +65,7 @@
   *  (ContainerFactory for JBoss and EmbededTomcatService for Tomcat).
   *
   *   @author <a href="mailto:[EMAIL PROTECTED]">Daniel Schulze</a>
  -*   @version $Revision: 1.16 $
  +*   @version $Revision: 1.17 $
   */
   public class J2eeDeployer 
   extends ServiceMBeanSupport
  @@ -432,6 +433,11 @@
         {
            log.error ("Starting "+m.name+" failed!");
            throw new J2eeDeploymentException ("Error while starting "+m.name+": " + 
_mbe.getTargetException ().getMessage (), _mbe.getTargetException ());
  +      }
  +      catch (RuntimeErrorException e)
  +      {
  +         log.error ("Starting "+m.name+" failed!");
  +         throw new J2eeDeploymentException ("Error while starting "+m.name+": " + 
e.getTargetError ().getMessage (), e.getTargetError ());
         }
         catch (RuntimeMBeanException e)
         {
  
  
  
  1.3       +18 -18    jboss/src/main/org/jboss/deployment/J2eeDeploymentException.java
  
  Index: J2eeDeploymentException.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/deployment/J2eeDeploymentException.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- J2eeDeploymentException.java      2000/12/07 15:44:07     1.2
  +++ J2eeDeploymentException.java      2001/02/08 22:18:44     1.3
  @@ -10,29 +10,29 @@
    *   <description> 
    *      
    *   @author Daniel Schulze [EMAIL PROTECTED]
  - *   @version $Revision: 1.2 $
  + *   @version $Revision: 1.3 $
    */
   public class J2eeDeploymentException 
        extends Exception
   {
  -   Exception exception;
  +    Throwable exception;
   
  -   // Constructors --------------------------------------------------
  -     public J2eeDeploymentException (String message)
  -   {
  -             super (message);
  -     }
  -     
  -     public J2eeDeploymentException (String message, Exception e)
  -   {
  -             super (message);
  -      this.exception = e;
  -     }
  -   
  -   public Exception getException()
  -   {
  -      return exception;
  -   }
  +    // Constructors --------------------------------------------------
  +    public J2eeDeploymentException (String message)
  +    {
  +        super (message);
  +    }
  +
  +    public J2eeDeploymentException (String message, Throwable e)
  +    {
  +        super (message);
  +        this.exception = e;
  +    }
  +
  +    public Throwable getException()
  +    {
  +        return exception;
  +    }
   }