cvs commit: jakarta-slide/src/share/org/apache/slide/store AbstractStore.java

[ozeigermann]

ozeigermann    2004/04/01 23:58:23

  Modified:    src/share/org/apache/slide/store Tag: SLIDE_2_1_EXTERNAL_TX
                        AbstractStore.java
  Log:
  Initial external transaction implementation
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.39.2.1  +20 -20    
jakarta-slide/src/share/org/apache/slide/store/AbstractStore.java
  
  Index: AbstractStore.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/store/AbstractStore.java,v
  retrieving revision 1.39
  retrieving revision 1.39.2.1
  diff -u -r1.39 -r1.39.2.1
  --- AbstractStore.java        25 Feb 2004 10:04:29 -0000      1.39
  +++ AbstractStore.java        2 Apr 2004 07:58:23 -0000       1.39.2.1
  @@ -502,7 +502,7 @@
               throw new IllegalArgumentException("ContentIndexer must not be null");
           }
           this.contentIndexer = contentIndexer;
  -        addResourceManager(this.contentIndexer);
  +//        addResourceManager(this.contentIndexer);
           
       }
       
  @@ -1289,7 +1289,7 @@
           revisionDescriptor.validate();
           revisionContent.validate();
           
  -        enlist(contentIndexer);
  +//        enlist(contentIndexer);
           enlist(contentStore);
           try {
               contentIndexer.createIndex (uri, revisionDescriptor, revisionContent);
  @@ -1297,20 +1297,20 @@
                                                  revisionContent);
               
           } catch (ServiceAccessException e) {
  -            delist(contentIndexer, false);
  +//            delist(contentIndexer, false);
               delist(contentStore, false);
               throw e;
           } catch (RevisionAlreadyExistException e) {
  -            delist(contentIndexer);
  +//            delist(contentIndexer);
               delist(contentStore);
               throw e;
           } catch (Throwable t) {
  -            delist(contentIndexer, false);
  +//            delist(contentIndexer, false);
               delist(contentStore, false);
               // Wrap everything else in a ServiceAccessException
               throw new ServiceAccessException(contentStore, t);
           }
  -        delist(contentIndexer);
  +//        delist(contentIndexer);
           delist(contentStore);
       }
       
  @@ -1329,29 +1329,29 @@
           revisionDescriptor.validate();
           revisionContent.validate();
           
  -        enlist (contentIndexer);
  +//        enlist (contentIndexer);
           enlist(contentStore);
           try {
               contentIndexer.updateIndex (uri, revisionDescriptor, revisionContent);
               contentStore.storeRevisionContent(uri, revisionDescriptor,
                                                 revisionContent);
           } catch (ServiceAccessException e) {
  -            delist (contentIndexer, false);
  +//            delist (contentIndexer, false);
               delist (contentStore, false);
               throw e;
           } catch (RevisionNotFoundException e) {
  -            delist(contentIndexer);
  +//            delist(contentIndexer);
               delist(contentStore);
               throw e;
           } catch (Throwable t) {
  -            delist(contentIndexer, false);
  +//            delist(contentIndexer, false);
               delist(contentStore, false);
               
               // Wrap everything else in a ServiceAccessException
               throw new ServiceAccessException (contentStore, t);
           }
           
  -        delist(contentIndexer);
  +//        delist(contentIndexer);
           delist(contentStore);
       }
       
  @@ -1367,7 +1367,7 @@
           throws ServiceAccessException {
           revisionDescriptor.validate();
           
  -        enlist(contentIndexer);
  +//        enlist(contentIndexer);
           enlist(contentStore);
           
           try {
  @@ -1375,18 +1375,18 @@
               contentStore.removeRevisionContent(uri, revisionDescriptor);
               
           } catch (ServiceAccessException e) {
  -            delist(contentIndexer, false);
  +//            delist(contentIndexer, false);
               delist(contentStore, false);
               throw e;
           } catch (Throwable t) {
  -            delist(contentIndexer, false);
  +//            delist(contentIndexer, false);
               delist(contentStore, false);
               
               // Wrap everything else in a ServiceAccessException
               throw new ServiceAccessException(contentStore, t);
           }
           
  -        delist(contentIndexer);
  +//        delist(contentIndexer);
           delist(contentStore);
       }
       
  @@ -1534,7 +1534,7 @@
               }
           } catch (Exception e) {
               // Something went wrong.
  -            throw new ServiceAccessException(this, e.getMessage());
  +            throw new ServiceAccessException(this, e);
           }
       }
       
  
  
  

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