[mule-scm] [mule] [15961] branches/mule-3.x: Merged revisions 15960 via svnmerge from

View: New views

1 Messages — Rating Filter: Alert me

[mule-scm] [mule] [15961] branches/mule-3.x: Merged revisions 15960 via svnmerge from

by dfeist :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Some parts of this message have been removed. Learn more about Nabble's security policy.

[mule] [15961] branches/mule-3.x: Merged revisions 15960 via svnmerge from

Revision: 15961
Author: dfeist
Date: 2009-11-03 21:22:21 -0600 (Tue, 03 Nov 2009)

Log Message

Merged revisions 15960 via svnmerge from 
https://svn.codehaus.org/mule/branches/mule-2.2.x

................
  r15960 | dfeist | 2009-11-04 00:48:43 -0200 (Wed, 04 Nov 2009) | 9 lines
  
  Merged revisions 15959 via svnmerge from 
  https://svn.codehaus.org/mule/branches/mule-2.1.x
  
  ........
    r15959 | dfeist | 2009-11-04 00:38:49 -0200 (Wed, 04 Nov 2009) | 1 line
    
    MULE-4589 java.lang.IllegalStateException: Phase 'start' has already been executed
  ........
................

Modified Paths

branches/mule-3.x/core/src/main/java/org/mule/DefaultMuleContext.java
branches/mule-3.x/core/src/main/java/org/mule/lifecycle/GenericLifecycleManager.java
branches/mule-3.x/core/src/main/java/org/mule/lifecycle/phases/MuleContextInitialisePhase.java

Added Paths

branches/mule-3.x/core/src/test/java/org/mule/context/MuleContextLifecycleTestCase.java

Property Changed

branches/mule-3.x/

Diff

Property changes: branches/mule-3.x

Name: svnmerge-integrated
   - /branches/mule-3.x-messaging:1-15430 /branches/mule-2.2.x:1-14052,14055-14056,14058-14062,14064,14066-14073,14076-14084,14086-14088,14091-14095,14097-14098,14100-14101,14103-14104,14106-14109,14111-14115,14117-14121,14123-14132,14135-14140,14142-14149,14152-14154,14156-14162,14165-14171,14173-14180,14182,14184-14189,14191-14195,14197-14203,14205,14207-14208,14210-14211,14214-14215,14217-14227,14230,14232-14236,14239,14241,14244,14246-14248,14250,14252-14253,14255-14256,14258-14263,14266-14269,14271-14278,14281-14282,14284,14286-14288,14292-14295,14297-14299,14301-14303,14306-14308,14310-14311,14313-14319,14321-14325,14327-14329,14331,14333-14339,14341-14343,14345-14357,14364-14368,14370-14374,14376-14378,14380-14381,14383-14397,14399-14400,14402,14404-14405,14407-14408,14410-14411,14413-14418,14421-14434,14436,14438,14440-14444,14449-14457,14459,14461-14462,14464-14469,14471-14475,14478-14480,14482-14484,14486-14504,14508-14535,14537-14592,14594-14595,14597-14638,14640-1
 4644,14646-14647,14649-14761,14763-14838,14840-14869,14872-14881,14890,14897,14899,14904,14906-14908,14910-14911,14913,14916,14921,14943,14946-14948,14969,14991,15010,15012,15022,15027,15040,15044,15063,15066,15076,15088,15094,15098,15101,15107,15112,15126,15132,15143,15189,15192,15200,15204,15207,15215,15220,15229-15230,15241,15245,15271,15284,15291,15293-15294,15296,15298-15299,15302,15307,15311,15315,15317-15322,15324-15355,15357-15365,15367,15369-15372,15374,15377,15387,15418,15420-15430,15433,15440,15442-15443,15450,15452,15456-15462,15465,15467-15470,15489-15492,15513,15532,15554,15556-15561,15563-15586,15588-15589,15591-15596,15599-15665,15667-15688,15690-15721,15723-15745,15747-15753,15755-15756,15760-15765,15774-15777,15781-15794,15796-15800,15802-15804,15806-15828,15830-15833,15835-15858,15863,15865-15875,15881-15884,15889,15892-15902,15908-15910,15912-15913,15915-15921,15923,15935-15938,15951-15953 /branches/mule-3.x-xmpp:1-15727
   + /branches/mule-3.x-messaging:1-15430 /branches/mule-2.2.x:1-14052,14055-14056,14058-14062,14064,14066-14073,14076-14084,14086-14088,14091-14095,14097-14098,14100-14101,14103-14104,14106-14109,14111-14115,14117-14121,14123-14132,14135-14140,14142-14149,14152-14154,14156-14162,14165-14171,14173-14180,14182,14184-14189,14191-14195,14197-14203,14205,14207-14208,14210-14211,14214-14215,14217-14227,14230,14232-14236,14239,14241,14244,14246-14248,14250,14252-14253,14255-14256,14258-14263,14266-14269,14271-14278,14281-14282,14284,14286-14288,14292-14295,14297-14299,14301-14303,14306-14308,14310-14311,14313-14319,14321-14325,14327-14329,14331,14333-14339,14341-14343,14345-14357,14364-14368,14370-14374,14376-14378,14380-14381,14383-14397,14399-14400,14402,14404-14405,14407-14408,14410-14411,14413-14418,14421-14434,14436,14438,14440-14444,14449-14457,14459,14461-14462,14464-14469,14471-14475,14478-14480,14482-14484,14486-14504,14508-14535,14537-14592,14594-14595,14597-14638,14640-1
 4644,14646-14647,14649-14761,14763-14838,14840-14869,14872-14881,14890,14897,14899,14904,14906-14908,14910-14911,14913,14916,14921,14943,14946-14948,14969,14991,15010,15012,15022,15027,15040,15044,15063,15066,15076,15088,15094,15098,15101,15107,15112,15126,15132,15143,15189,15192,15200,15204,15207,15215,15220,15229-15230,15241,15245,15271,15284,15291,15293-15294,15296,15298-15299,15302,15307,15311,15315,15317-15322,15324-15355,15357-15365,15367,15369-15372,15374,15377,15387,15418,15420-15430,15433,15440,15442-15443,15450,15452,15456-15462,15465,15467-15470,15489-15492,15513,15532,15554,15556-15561,15563-15586,15588-15589,15591-15596,15599-15665,15667-15688,15690-15721,15723-15745,15747-15753,15755-15756,15760-15765,15774-15777,15781-15794,15796-15800,15802-15804,15806-15828,15830-15833,15835-15858,15863,15865-15875,15881-15884,15889,15892-15902,15908-15910,15912-15913,15915-15921,15923,15935-15938,15951-15953,15960 /branches/mule-3.x-xmpp:1-15727

Modified: branches/mule-3.x/core/src/main/java/org/mule/DefaultMuleContext.java (15960 => 15961)

--- branches/mule-3.x/core/src/main/java/org/mule/DefaultMuleContext.java	2009-11-04 02:48:43 UTC (rev 15960)
+++ branches/mule-3.x/core/src/main/java/org/mule/DefaultMuleContext.java	2009-11-04 03:22:21 UTC (rev 15961)
@@ -160,7 +160,7 @@
     
     public synchronized void initialise() throws InitialisationException
     {
-        if (isInitialised())
+        if (lifecycleManager.getCurrentPhase().equals(Initialisable.PHASE_NAME))
         {
             return;
         }
@@ -204,30 +204,33 @@
 
     public synchronized void start() throws MuleException
     {
+        if (isStarted())
+        {
+            return;
+        }
+
         lifecycleManager.checkPhase(Startable.PHASE_NAME);
-        if (!isStarted())
+
+        if (getSecurityManager() == null)
         {
-            if (getSecurityManager() == null)
-            {
-                throw new MuleRuntimeException(CoreMessages.objectIsNull("securityManager"));
-            }
-            if (getQueueManager() == null)
-            {
-                throw new MuleRuntimeException(CoreMessages.objectIsNull("queueManager"));
-            }
+            throw new MuleRuntimeException(CoreMessages.objectIsNull("securityManager"));
+        }
+        if (getQueueManager() == null)
+        {
+            throw new MuleRuntimeException(CoreMessages.objectIsNull("queueManager"));
+        }
 
-            startDate = System.currentTimeMillis();
+        startDate = System.currentTimeMillis();
 
-            fireNotification(new MuleContextNotification(this, MuleContextNotification.CONTEXT_STARTING));
+        fireNotification(new MuleContextNotification(this, MuleContextNotification.CONTEXT_STARTING));
 
-            lifecycleManager.firePhase(this, Startable.PHASE_NAME);
+        lifecycleManager.firePhase(this, Startable.PHASE_NAME);
 
-            fireNotification(new MuleContextNotification(this, MuleContextNotification.CONTEXT_STARTED));
+        fireNotification(new MuleContextNotification(this, MuleContextNotification.CONTEXT_STARTED));
 
-            if (logger.isInfoEnabled())
-            {
-                logger.info(startupScreen.toString());
-            }
+        if (logger.isInfoEnabled())
+        {
+            logger.info(startupScreen.toString());
         }
     }
 
@@ -251,9 +254,10 @@
         {
             return;
         }
-             
+
+        lifecycleManager.checkPhase(Disposable.PHASE_NAME);
+        
         ServerNotificationManager notificationManager = getNotificationManager();
-        lifecycleManager.checkPhase(Disposable.PHASE_NAME);
         fireNotification(new MuleContextNotification(this, MuleContextNotification.CONTEXT_DISPOSING));
 
         try

Modified: branches/mule-3.x/core/src/main/java/org/mule/lifecycle/GenericLifecycleManager.java (15960 => 15961)

--- branches/mule-3.x/core/src/main/java/org/mule/lifecycle/GenericLifecycleManager.java	2009-11-04 02:48:43 UTC (rev 15960)
+++ branches/mule-3.x/core/src/main/java/org/mule/lifecycle/GenericLifecycleManager.java	2009-11-04 03:22:21 UTC (rev 15961)
@@ -197,19 +197,16 @@
 
     public void checkPhase(String name) throws IllegalStateException
     {
-        if (completedPhases.contains(name))
-        {
-            throw new IllegalStateException("Phase '" + name + "' has already been executed");
-        }
-
-        if (name.equalsIgnoreCase(executingPhase))
-        {
-            throw new IllegalStateException("Phase '" + name + "' is already currently being executed");
-        }
-
         if (executingPhase != null)
         {
-            throw new IllegalStateException("Currently executing lifecycle phase: " + executingPhase);
+            if (name.equalsIgnoreCase(executingPhase))
+            {
+                throw new IllegalStateException("Phase '" + name + "' is already currently being executed");
+            }
+            else
+            {
+                throw new IllegalStateException("Currently executing lifecycle phase: " + executingPhase);
+            }
         }
 
         Integer phaseIndex = index.get(name);
@@ -217,13 +214,6 @@
         {
             throw new IllegalStateException("Phase does not exist: " + name);
         }
-        if (NotInLifecyclePhase.PHASE_NAME.equals(currentPhase))
-        {
-            if (phaseIndex > 0)
-            {
-                throw new IllegalStateException("The first lifecycle phase has to be called before the '" + name + "' phase");
-            }
-        }
         else
         {
             LifecyclePhase phase = (LifecyclePhase) lifecycles.get(phaseIndex);

Modified: branches/mule-3.x/core/src/main/java/org/mule/lifecycle/phases/MuleContextInitialisePhase.java (15960 => 15961)

--- branches/mule-3.x/core/src/main/java/org/mule/lifecycle/phases/MuleContextInitialisePhase.java	2009-11-04 02:48:43 UTC (rev 15960)
+++ branches/mule-3.x/core/src/main/java/org/mule/lifecycle/phases/MuleContextInitialisePhase.java	2009-11-04 03:22:21 UTC (rev 15961)
@@ -22,5 +22,6 @@
     public MuleContextInitialisePhase()
     {
         super(Initialisable.PHASE_NAME, Initialisable.class, Disposable.PHASE_NAME);
+        registerSupportedPhase(NotInLifecyclePhase.PHASE_NAME);
     }
 }
\ No newline at end of file

Copied: branches/mule-3.x/core/src/test/java/org/mule/context/MuleContextLifecycleTestCase.java (from rev 15960, branches/mule-2.2.x/core/src/test/java/org/mule/context/MuleContextLifecycleTestCase.java) (0 => 15961)

--- branches/mule-3.x/core/src/test/java/org/mule/context/MuleContextLifecycleTestCase.java	                        (rev 0)
+++ branches/mule-3.x/core/src/test/java/org/mule/context/MuleContextLifecycleTestCase.java	2009-11-04 03:22:21 UTC (rev 15961)
@@ -0,0 +1,251 @@
+/*
+ * $Id$
+ * --------------------------------------------------------------------------------------
+ * Copyright (c) MuleSource, Inc.  All rights reserved.  http://www.mulesource.com
+ *
+ * The software in this package is published under the terms of the CPAL v1.0
+ * license, a copy of which has been included with this distribution in the
+ * LICENSE.txt file.
+ */
+
+package org.mule.context;
+
+import org.mule.api.MuleContext;
+import org.mule.api.MuleException;
+import org.mule.api.context.MuleContextBuilder;
+import org.mule.config.builders.DefaultsConfigurationBuilder;
+import org.mule.tck.AbstractMuleTestCase;
+
+public class MuleContextLifecycleTestCase extends AbstractMuleTestCase
+{
+
+    private MuleContextBuilder ctxBuilder = new DefaultMuleContextBuilder();
+
+    @Override
+    protected MuleContext createMuleContext() throws Exception
+    {
+        return null;
+    }
+
+    public void testInitialise() throws MuleException
+    {
+        MuleContext ctx = ctxBuilder.buildMuleContext();
+        assertFalse(ctx.isInitialised());
+        assertFalse(ctx.isInitialising());
+        assertFalse(ctx.isStarted());
+        assertFalse(ctx.isDisposed());
+        assertFalse(ctx.isDisposing());
+
+        ctx.initialise();
+        assertTrue(ctx.isInitialised());
+        assertFalse(ctx.isInitialising());
+        assertFalse(ctx.isStarted());
+        assertFalse(ctx.isDisposed());
+        assertFalse(ctx.isDisposing());
+
+        // Double initialisation does not fail.
+        // MuleContext state stays the same
+        ctx.initialise();
+        assertTrue(ctx.isInitialised());
+        assertFalse(ctx.isInitialising());
+        assertFalse(ctx.isStarted());
+        assertFalse(ctx.isDisposed());
+        assertFalse(ctx.isDisposing());
+
+        new DefaultsConfigurationBuilder().configure(ctx);
+        ctx.start();
+        // Attempt to initialise once started should fail!
+        try
+        {
+            ctx.initialise();
+            fail();
+        }
+        catch (Exception e)
+        {
+        }
+
+        ctx.stop();
+        // Attempt to initialise once stopped should fail!
+        try
+        {
+            ctx.initialise();
+            fail();
+        }
+        catch (Exception e)
+        {
+        }
+
+        ctx.dispose();
+        // Attempt to initialise once disposed should fail!
+        try
+        {
+            ctx.initialise();
+            fail();
+        }
+        catch (Exception e)
+        {
+        }
+    }
+
+    public void testStart() throws MuleException
+    {
+        MuleContext ctx = ctxBuilder.buildMuleContext();
+
+        // Attempt to start before initialise should fail!
+        try
+        {
+            ctx.start();
+            fail();
+        }
+        catch (Exception e)
+        {
+        }
+
+        ctx.initialise();
+        new DefaultsConfigurationBuilder().configure(ctx);
+        ctx.start();
+        assertTrue(ctx.isInitialised());
+        assertFalse(ctx.isInitialising());
+        assertTrue(ctx.isStarted());
+        assertFalse(ctx.isDisposed());
+        assertFalse(ctx.isDisposing());
+
+        // Double start does not fail.
+        // MuleContext state stays the same
+        ctx.start();
+        assertTrue(ctx.isInitialised());
+        assertFalse(ctx.isInitialising());
+        assertTrue(ctx.isStarted());
+        assertFalse(ctx.isDisposed());
+        assertFalse(ctx.isDisposing());
+
+        ctx.stop();
+        ctx.start();
+        assertTrue(ctx.isInitialised());
+        assertFalse(ctx.isInitialising());
+        assertTrue(ctx.isStarted());
+        assertFalse(ctx.isDisposed());
+        assertFalse(ctx.isDisposing());
+
+        ctx.dispose();
+        // Attempt to start once disposed should fail!
+        try
+        {
+            ctx.start();
+            fail();
+        }
+        catch (Exception e)
+        {
+        }
+    }
+
+    public void testStop() throws MuleException
+    {
+        MuleContext ctx = ctxBuilder.buildMuleContext();
+
+        // Attempt to stop before initialise should fail!
+        try
+        {
+            ctx.stop();
+            fail();
+        }
+        catch (Exception e)
+        {
+        }
+
+        ctx.initialise();
+        ctx.stop();
+        assertTrue(ctx.isInitialised());
+        assertFalse(ctx.isInitialising());
+        assertFalse(ctx.isStarted());
+        assertFalse(ctx.isDisposed());
+        assertFalse(ctx.isDisposing());
+
+        new DefaultsConfigurationBuilder().configure(ctx);
+        ctx.start();
+        ctx.stop();
+        assertTrue(ctx.isInitialised());
+        assertFalse(ctx.isInitialising());
+        assertFalse(ctx.isStarted());
+        assertFalse(ctx.isDisposed());
+        assertFalse(ctx.isDisposing());
+
+        ctx.start();
+        ctx.stop();
+        // Attempt to stop twice should fail!
+        try
+        {
+            ctx.stop();
+            fail();
+        }
+        catch (Exception e)
+        {
+        }
+
+        ctx.dispose();
+        // Attempt to start once disposed should fail!
+        try
+        {
+            ctx.stop();
+            fail();
+        }
+        catch (Exception e)
+        {
+        }
+    }
+
+    public void testDipose() throws MuleException
+    {
+        MuleContext ctx = ctxBuilder.buildMuleContext();
+
+        ctx.dispose();
+        assertFalse(ctx.isInitialised());
+        assertFalse(ctx.isInitialising());
+        assertFalse(ctx.isStarted());
+        assertTrue(ctx.isDisposed());
+        assertFalse(ctx.isDisposing());
+
+        ctx = ctxBuilder.buildMuleContext();
+        ctx.initialise();
+        ctx.dispose();
+        assertFalse(ctx.isInitialised());
+        assertFalse(ctx.isInitialising());
+        assertFalse(ctx.isStarted());
+        assertTrue(ctx.isDisposed());
+        assertFalse(ctx.isDisposing());
+
+        ctx = ctxBuilder.buildMuleContext();
+        ctx.initialise();
+        new DefaultsConfigurationBuilder().configure(ctx);
+        ctx.start();
+        ctx.dispose();
+        assertFalse(ctx.isInitialised());
+        assertFalse(ctx.isInitialising());
+        assertFalse(ctx.isStarted());
+        assertTrue(ctx.isDisposed());
+        assertFalse(ctx.isDisposing());
+
+        ctx = ctxBuilder.buildMuleContext();
+        ctx.initialise();
+        new DefaultsConfigurationBuilder().configure(ctx);
+        ctx.start();
+        ctx.stop();
+        ctx.dispose();
+        assertFalse(ctx.isInitialised());
+        assertFalse(ctx.isInitialising());
+        assertFalse(ctx.isStarted());
+        assertTrue(ctx.isDisposed());
+        assertFalse(ctx.isDisposing());
+
+        ctx = ctxBuilder.buildMuleContext();
+        ctx.initialise();
+        ctx.dispose();
+        ctx.dispose();
+        assertFalse(ctx.isInitialised());
+        assertFalse(ctx.isInitialising());
+        assertFalse(ctx.isStarted());
+        assertTrue(ctx.isDisposed());
+        assertFalse(ctx.isDisposing());
+
+    }
+}

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email