dflorey     2004/03/09 02:11:49

  Modified:    src/share/org/apache/slide/content ContentImpl.java
  Log:
  Bugfix for create event
  
  Revision  Changes    Path
  1.57      +9 -9      
jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java
  
  Index: ContentImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- ContentImpl.java  26 Feb 2004 11:31:20 -0000      1.56
  +++ ContentImpl.java  9 Mar 2004 10:11:49 -0000       1.57
  @@ -410,9 +410,6 @@
               new NodeRevisionDescriptors(isVersioned);
           revisionDescriptors.setUri(strUri);
   
  -        // Fire event
  -        if ( ContentEvent.CREATE.isEnabled() ) 
EventDispatcher.getInstance().fireVetoableEvent(ContentEvent.CREATE, new 
ContentEvent(this, token, namespace, strUri, revisionDescriptors));
  -
           objectUri.getStore()
               .createRevisionDescriptors(objectUri, revisionDescriptors);
       }
  @@ -541,7 +538,10 @@
               revisionDescriptor.setRevisionNumber(newRevisionNumber);
               
               if (!revisionDescriptors.hasRevisions()) {
  -                
  +
  +                // Fire event
  +                if ( ContentEvent.CREATE.isEnabled() ) 
EventDispatcher.getInstance().fireVetoableEvent(ContentEvent.CREATE, new 
ContentEvent(this, token, namespace, objectUri.toString(), revisionDescriptors, 
revisionDescriptor, revisionContent));
  +
                   // Invoke interceptors
                   invokeInterceptors(token, revisionDescriptors,
                                      revisionDescriptor,
  @@ -1342,7 +1342,7 @@
   
           // Fire event
           if ( revisionDescriptor.getRevisionNumber() != 
NodeRevisionNumber.HIDDEN_0_0 && ContentEvent.CREATE.isEnabled() ) 
EventDispatcher.getInstance().fireVetoableEvent(ContentEvent.CREATE, new 
ContentEvent(this, token, namespace, objectUri.toString(), revisionDescriptors, 
revisionDescriptor));
  -        
  +
           // Invoke interceptors
           invokeInterceptors(token, revisionDescriptors, revisionDescriptor,
                              null, PRE_STORE);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to