[jboss-cvs] jboss-seam/src/main/org/jboss/seam/interceptors ...

[Gavin King]

  User: gavin   
  Date: 06/09/26 10:47:58

  Modified:    src/main/org/jboss/seam/interceptors 
                        ManagedEntityIdentityInterceptor.java
  Log:
  fixed bug when no conversation context active
  
  Revision  Changes    Path
  1.2       +4 -3      jboss-seam/src/main/org/jboss/seam/interceptors/ManagedEntityIdentityInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedEntityIdentityInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/ManagedEntityIdentityInterceptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- ManagedEntityIdentityInterceptor.java	26 Sep 2006 00:29:53 -0000	1.1
  +++ ManagedEntityIdentityInterceptor.java	26 Sep 2006 14:47:58 -0000	1.2
  @@ -71,16 +71,16 @@
      @AroundInvoke
      public Object aroundInvoke(InvocationContext ctx) throws Exception
      {
  -      entityRefsToIds(ctx);
  -      Object result = ctx.proceed();
         entityIdsToRefs(ctx);
  +      Object result = ctx.proceed();
  +      entityRefsToIds(ctx);
         return result;
      }
      
      public void entityRefsToIds(InvocationContext ctx) throws Exception
      {      
         Set<String> pcs = TouchedContexts.instance();
  -      if ( pcs.size()>0 )
  +      if ( pcs!=null && pcs.size()>0 )
         {
            Object bean = ctx.getTarget();
            Class beanClass = Seam.getBeanClass( bean.getClass() );
  @@ -153,6 +153,7 @@
                  try
                  {
                     Field field = beanClass.getDeclaredField( pe.getFieldName() );
  +                  if ( !field.isAccessible() ) field.setAccessible(true);
                     field.set(bean, reference);
                     break;
                  }