From d14518009949caf5979ec6d9efcebf590188bc1f Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Thu, 20 Sep 2007 18:55:54 +0000
Subject: [PATCH] Benchmark client zip and reporting fixes.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6845 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/admin/patch/impl/InvalidNameEndingPatch.java  | 10 +++++-----
 .../model/filefolder/loader/AbstractLoaderThread.java  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/java/org/alfresco/repo/admin/patch/impl/InvalidNameEndingPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/InvalidNameEndingPatch.java
index a89a46c281..03d32829af 100644
--- a/source/java/org/alfresco/repo/admin/patch/impl/InvalidNameEndingPatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/InvalidNameEndingPatch.java
@@ -35,7 +35,7 @@ import java.util.List;
 import org.alfresco.i18n.I18NUtil;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.admin.patch.AbstractPatch;
-import org.alfresco.repo.domain.hibernate.NodeImpl;
+import org.alfresco.repo.domain.Node;
 import org.alfresco.repo.node.db.NodeDaoService;
 import org.alfresco.service.cmr.admin.PatchException;
 import org.alfresco.service.cmr.repository.DuplicateChildNodeNameException;
@@ -158,10 +158,10 @@ public class InvalidNameEndingPatch extends AbstractPatch
         {
             // get the association types to check
             @SuppressWarnings("unused")
-            List<NodeImpl> nodes = getInvalidNames();
+            List<Node> nodes = getInvalidNames();
 
             int updated = 0;
-            for (NodeImpl node : nodes)
+            for (Node node : nodes)
             {
                 NodeRef nodeRef = node.getNodeRef();
                 String name = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
@@ -206,7 +206,7 @@ public class InvalidNameEndingPatch extends AbstractPatch
         }
         
         @SuppressWarnings("unchecked")
-        private List<NodeImpl> getInvalidNames()
+        private List<Node> getInvalidNames()
         {
             HibernateCallback callback = new HibernateCallback()
             {
@@ -221,7 +221,7 @@ public class InvalidNameEndingPatch extends AbstractPatch
                     return query.list();
                 }
             };
-            List<NodeImpl> results = (List<NodeImpl>) getHibernateTemplate().execute(callback);
+            List<Node> results = (List<Node>) getHibernateTemplate().execute(callback);
             return results;
         }
         
diff --git a/source/java/org/alfresco/repo/model/filefolder/loader/AbstractLoaderThread.java b/source/java/org/alfresco/repo/model/filefolder/loader/AbstractLoaderThread.java
index 0a637b878c..bc7ddda6ed 100644
--- a/source/java/org/alfresco/repo/model/filefolder/loader/AbstractLoaderThread.java
+++ b/source/java/org/alfresco/repo/model/filefolder/loader/AbstractLoaderThread.java
@@ -189,8 +189,8 @@ public abstract class AbstractLoaderThread extends Thread
           .append(String.format("%40s", loaderName)).append("\t")
           .append(String.format("%15.0f", (float)statCount)).append("\t")
           .append(String.format("%15.3f", statTotalSec)).append("\t")
-          .append(String.format("%15.3f", statPerSec)).append("\t")
           .append(String.format("%15.3f", statAveSec)).append("\t")
+          .append(String.format("%15.3f", statPerSec)).append("\t")
           .append("");
         return sb.toString();
     }