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

[Peter Muir]

  User: pmuir   
  Date: 07/11/13 14:29:25

  Modified:    src/main/org/jboss/seam/framework   EntityHome.java
                        Home.java
  Log:
  JBSEAM-2212
  
  Revision  Changes    Path
  1.23      +9 -1      jboss-seam/src/main/org/jboss/seam/framework/EntityHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EntityHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/EntityHome.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- EntityHome.java	21 Sep 2007 19:02:06 -0000	1.22
  +++ EntityHome.java	13 Nov 2007 19:29:24 -0000	1.23
  @@ -120,7 +120,15 @@
      @Override
      protected String getEntityName()
      {
  +      try
  +      {
         return PersistenceProvider.instance().getName(getInstance(), getEntityManager());
      }
  +      catch (IllegalArgumentException e) 
  +      {
  +         // Handle that the passed object may not be an entity
  +         return null;
  +      }
  +   }
      
   }
  
  
  
  1.27      +13 -2     jboss-seam/src/main/org/jboss/seam/framework/Home.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Home.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/Home.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -b -r1.26 -r1.27
  --- Home.java	3 Oct 2007 16:02:56 -0000	1.26
  +++ Home.java	13 Nov 2007 19:29:24 -0000	1.27
  @@ -247,14 +247,25 @@
      protected void raiseAfterTransactionSuccessEvent()
      {
         raiseTransactionSuccessEvent("org.jboss.seam.afterTransactionSuccess");
  -      raiseTransactionSuccessEvent("org.jboss.seam.afterTransactionSuccess." + getSimpleEntityName());
  +      String simpleEntityName = getSimpleEntityName();
  +      if (simpleEntityName != null)
  +      {
  +         raiseTransactionSuccessEvent("org.jboss.seam.afterTransactionSuccess." + simpleEntityName);
  +      }
      }
      
      protected String getSimpleEntityName()
      {
         String name = getEntityName();
  +      if (name != null)
  +      {
         return name.lastIndexOf(".") > 0 && name.lastIndexOf(".") < name.length()  ? name.substring(name.lastIndexOf(".") + 1, name.length()) : name;
      }
  +      else
  +      {
  +         return null;
  +      }
  +   }
      
      protected abstract String getEntityName();