[jboss-cvs] JBossAS SVN: r57282 - trunk/ejb3x/src/main/javax/interceptor

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

Author: wolfc
Date: 2006-09-29 06:50:51 -0400 (Fri, 29 Sep 2006)
New Revision: 57282

Modified:
   trunk/ejb3x/src/main/javax/interceptor/ExcludeDefaultInterceptors.java
   trunk/ejb3x/src/main/javax/interceptor/InvocationContext.java
Log:
Merge JBCTS-307

Modified: trunk/ejb3x/src/main/javax/interceptor/ExcludeDefaultInterceptors.java
===================================================================
--- trunk/ejb3x/src/main/javax/interceptor/ExcludeDefaultInterceptors.java	2006-09-29 07:50:40 UTC (rev 57281)
+++ trunk/ejb3x/src/main/javax/interceptor/ExcludeDefaultInterceptors.java	2006-09-29 10:50:51 UTC (rev 57282)
@@ -18,7 +18,7 @@
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @version $Revision$
  */
- at Target({METHOD, TYPE}) @Retention(RUNTIME)
+ at Target({TYPE, METHOD}) @Retention(RUNTIME)
 public @interface ExcludeDefaultInterceptors {
 
 }

Modified: trunk/ejb3x/src/main/javax/interceptor/InvocationContext.java
===================================================================
--- trunk/ejb3x/src/main/javax/interceptor/InvocationContext.java	2006-09-29 07:50:40 UTC (rev 57281)
+++ trunk/ejb3x/src/main/javax/interceptor/InvocationContext.java	2006-09-29 10:50:51 UTC (rev 57282)
@@ -40,7 +40,10 @@
 
    public void setParameters(Object[] params);
 
-   public java.util.Map getContextData();
+   /**
+    * Returns the context data associated with this invocation or lifecycle callback. If there is no context data, an empty Map object will be returned.
+    */
+   public java.util.Map<String, Object> getContextData();
 
    public Object proceed() throws Exception;
 }
\ No newline at end of file