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

[jBoss CVS Development]

  User: stark   
  Date: 01/02/08 14:08:37

  Modified:    src/main/org/jboss/deployment J2eeDeployer.java
  Log:
  Add handling of RuntimeMBeanException to correctly report the nested
  exception.
  
  Revision  Changes    Path
  1.16      +15 -4     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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- J2eeDeployer.java 2001/02/06 06:12:51     1.15
  +++ J2eeDeployer.java 2001/02/08 22:08:37     1.16
  @@ -37,6 +37,7 @@
   import javax.management.MBeanException;
   import javax.management.JMException;
   import javax.management.ObjectName;
  +import javax.management.RuntimeMBeanException;
   
   import org.jboss.logging.Log;
   import org.jboss.util.MBeanProxy;
  @@ -63,7 +64,7 @@
   *  (ContainerFactory for JBoss and EmbededTomcatService for Tomcat).
   *
   *   @author <a href="mailto:[EMAIL PROTECTED]">Daniel Schulze</a>
  -*   @version $Revision: 1.15 $
  +*   @version $Revision: 1.16 $
   */
   public class J2eeDeployer 
   extends ServiceMBeanSupport
  @@ -427,13 +428,23 @@
                  new Object[] { m.localUrls.firstElement().toString () }, new 
String[] { "java.lang.String" });
            }       
          }
  -      catch (MBeanException _mbe) {
  +      catch (MBeanException _mbe)
  +      {
            log.error ("Starting "+m.name+" failed!");
            throw new J2eeDeploymentException ("Error while starting "+m.name+": " + 
_mbe.getTargetException ().getMessage (), _mbe.getTargetException ());
  -      } catch (JMException _jme){
  +      }
  +      catch (RuntimeMBeanException e)
  +      {
  +         log.error ("Starting "+m.name+" failed!");
  +         throw new J2eeDeploymentException ("Error while starting "+m.name+": " + 
e.getTargetException ().getMessage (), e.getTargetException ());
  +      }
  +      catch (JMException _jme)
  +      {
            log.error ("Starting failed!");
            throw new J2eeDeploymentException ("Fatal error while interacting with 
deployer MBeans... " + _jme.getMessage ());
  -      } finally {                    
  +      }
  +      finally
  +      {
            Thread.currentThread().setContextClassLoader (oldCl);
         }
      }