cvs commit: jahia/core/src/java/org/jahia/services/importexport ImportExportBaseService.java

[Thomas Draier]

tdraier     2005/11/02 16:42:02 CET

  Modified files:
    core/src/java/org/jahia/services/importexport 
                                                  ImportExportBaseService.java 
  Log:
  avoid mode change
  
  Revision  Changes    Path
  1.39      +2 -6      
jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java.diff?r1=1.38&r2=1.39&f=h
  
  
  
  Index: ImportExportBaseService.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- ImportExportBaseService.java      25 Oct 2005 11:22:58 -0000      1.38
  +++ ImportExportBaseService.java      2 Nov 2005 15:42:01 -0000       1.39
  @@ -810,7 +810,7 @@
               JahiaSite destSite = 
ServicesRegistry.getInstance().getJahiaSitesService().getSite(parentDest.getSiteID());
               JahiaGroup admins = 
ServicesRegistry.getInstance().getJahiaGroupManagerService().lookupGroup(destSite.getID(),
 JahiaGroupManagerService.ADMINISTRATORS_GROUPNAME);
               JahiaUser user = (JahiaUser) admins.members().nextElement();
  -            jParams.setUser(user);
  +            jParams.setTheUser(user);
   
               Set files = new HashSet();
   
  @@ -844,11 +844,7 @@
           } catch (Throwable e) {
               logger.error("Error during copying",e);
           } finally {
  -            try {
  -                jParams.setUser(oldUser);
  -            } catch (JahiaException e) {
  -                // is never thrown ..
  -            }
  +            jParams.setTheUser(oldUser);
           }
           return null;
       }