svn commit: r106974 - /geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java /geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java

[dj...@apache.org]

Author: djencks
Date: Mon Nov 29 16:08:32 2004
New Revision: 106974

URL: http://svn.apache.org/viewcvs?view=rev&rev=106974
Log:
A couple of bug fixes from Dain.  This makes reference collection listeners get notified before the proxy stops rather than after
Modified:
   geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java
   geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java

Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java?view=diff&rev=106974&p1=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java&r1=106973&p2=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java&r2=106974
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java	(original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java	Mon Nov 29 16:08:32 2004
@@ -113,7 +113,7 @@
                 }
             }
 
-            public void stoping(ObjectName objectName) {
+            public void stopping(ObjectName objectName) {
                 removeTarget(objectName);
             }
 

Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java?view=diff&rev=106974&p1=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java&r1=106973&p2=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java&r2=106974
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java	(original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java	Mon Nov 29 16:08:32 2004
@@ -167,14 +167,15 @@
      * because this method sends JMX notifications.  Sending a general notification from a synchronized block
      * is a bad idea and therefore not allowed.
      *
-     * @throws Exception If an exception occurs while stoping this MBean or any of the childern
+     * @throws Exception If an exception occurs while stopping this MBean or any of the children
      */
     public final void stop() throws Exception {
-        assert !Thread.holdsLock(this): "This method cannot be called while holding a syncrhonized lock on this";
+        assert !Thread.holdsLock(this): "This method cannot be called while holding a synchronized lock on this";
 
         // move to the stopping state
+        State state;
         synchronized (this) {
-            State state = getStateInstance();
+            state = getStateInstance();
             if (state == State.STOPPED) {
                 return;
             }