svn commit: r1580854 - /tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java

[dblevins]

Author: dblevins
Date: Mon Mar 24 13:53:35 2014
New Revision: 1580854

URL: http://svn.apache.org/r1580854
Log:
TOMEE_1149 Add toString to BeforeEvent and AfterEvent objects to also include 
toString() of the wrapped event

Modified:
    
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java

Modified: 
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java?rev=1580854&r1=1580853&r2=1580854&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java
 Mon Mar 24 13:53:35 2014
@@ -357,8 +357,14 @@ public class ObserverManager {
         }
     }
 
+<<<<<<< .mine
+    public interface Invocation {
+
+        void invoke(Object event);
+=======
     public interface Invocation {
         void invoke(Object event);
+>>>>>>> .r1580853
     }
 
 
@@ -412,27 +418,6 @@ public class ObserverManager {
         }
     }
 
-    private static class Stack {
-        private final int[] seen = new int[10];
-        private int i = 0;
-
-        public boolean seen(Invocation invocation) {
-            int code = invocation.hashCode();
-
-            for (int j = 0; j < seen.length; j++) {
-                if (seen[j] == code) return true;
-            }
-
-            seen[i++] = code;
-
-            if (i >= seen.length) {
-                i = 0;
-            }
-
-            return false;
-        }
-    }
-
     private class AfterInvocation extends MethodInvocation {
 
         private AfterInvocation(Method method, Object observer) {
@@ -446,6 +431,10 @@ public class ObserverManager {
                 public Object getEvent() {
                     return event;
                 }
+
+                public String toString() {
+                    return "AfterEvent{} " + event;
+                }
             });
         }
     }
@@ -463,6 +452,10 @@ public class ObserverManager {
                 public Object getEvent() {
                     return event;
                 }
+
+                public String toString() {
+                    return "BeforeEvent{} " + event;
+                }
             });
         }
     }