[jboss-cvs] JBossCache/src-50/org/jboss/cache/pojo/interceptors ...

[Ben Wang]

  User: bwang   
  Date: 06/07/31 01:13:22

  Modified:    src-50/org/jboss/cache/pojo/interceptors 
                        CheckIdInterceptor.java
  Log:
  JBCACHE-702 user-specified region to perpend the id namespace.
  
  Revision  Changes    Path
  1.6       +3 -2      JBossCache/src-50/org/jboss/cache/pojo/interceptors/CheckIdInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CheckIdInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/interceptors/CheckIdInterceptor.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- CheckIdInterceptor.java	27 Jul 2006 14:25:27 -0000	1.5
  +++ CheckIdInterceptor.java	31 Jul 2006 05:13:22 -0000	1.6
  @@ -11,9 +11,10 @@
   import org.jboss.aop.joinpoint.MethodInvocation;
   import org.jboss.cache.Fqn;
   import org.jboss.cache.pojo.InternalConstant;
  +import org.jboss.cache.pojo.util.AopUtil;
   
   /** Interceptor (done via aop advice) to check the validity of the id specified by the user.
  - * @version $Id: CheckIdInterceptor.java,v 1.5 2006/07/27 14:25:27 bwang Exp $
  + * @version $Id: CheckIdInterceptor.java,v 1.6 2006/07/31 05:13:22 bwang Exp $
    */
   public class CheckIdInterceptor extends AbstractInterceptor
   {
  @@ -37,7 +38,7 @@
      private static void checkFqnValidity(Fqn id)
      {
         // throws exception is fqn is JBossInternal
  -      if (id.equals(InternalConstant.JBOSS_INTERNAL))
  +      if (id.equals(AopUtil.getIdWithRegion(InternalConstant.JBOSS_INTERNAL)))
         {
            throw new IllegalArgumentException("CheckIdIntercepto.checkFqnValidity(): fqn is not valid: " + id);
         }