[jboss-cvs] JBossAS SVN: r77540 - projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/container.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2008-08-27 11:09:02 -0400 (Wed, 27 Aug 2008)
New Revision: 77540

Added:
   projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/container/InjectionInvocation.java
Modified:
   projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/container/InvocationHelper.java
Log:
EJBTHREE-1474: introduced InjectionInvocation

Added: projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/container/InjectionInvocation.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/container/InjectionInvocation.java	                        (rev 0)
+++ projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/container/InjectionInvocation.java	2008-08-27 15:09:02 UTC (rev 77540)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.interceptors.container;
+
+import org.jboss.aop.joinpoint.Invocation;
+
+/**
+ * Injection happening on a managed object via the container.
+ * 
+ * Note that currently ejb3-interceptors can't reach injection code (circular dependency).
+ * 
+ * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface InjectionInvocation extends Invocation
+{
+
+}

Modified: projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/container/InvocationHelper.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/container/InvocationHelper.java	2008-08-27 15:07:32 UTC (rev 77539)
+++ projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/container/InvocationHelper.java	2008-08-27 15:09:02 UTC (rev 77540)
@@ -32,8 +32,8 @@
 {
    public static boolean isInjection(Invocation invocation)
    {
-      // FIXME: determine this properly, this is just a wild guess
-      return invocation == null;
+      // TODO: make sure invocation is never null
+      return invocation == null || invocation instanceof InjectionInvocation;
    }
    
    public static boolean isLifecycleCallback(Invocation invocation)