r1120 - in xwiki/trunk/src: main/java/com/xpn/xwiki main/java/com/xpn/xwiki/store test/java/com/xpn/xwiki/test

[Ludovic Dubost]

Author: ludovic
Date: 2006-08-05 10:07:49 +0200 (Sat, 05 Aug 2006)
New Revision: 1120

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/XWikiException.java
   xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java
   xwiki/trunk/src/test/java/com/xpn/xwiki/test/HibernateTestCase.java
Log:
Commented XWikiBatcher since it has to be different for hibernate 3.0 and 3.1

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWikiException.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWikiException.java	2006-08-05 07:53:44 UTC (rev 1119)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWikiException.java	2006-08-05 08:07:49 UTC (rev 1120)
@@ -25,7 +25,8 @@
 
 package com.xpn.xwiki;
 
-import com.xpn.xwiki.store.XWikiBatcher;
+
+// import com.xpn.xwiki.store.XWikiBatcher;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.velocity.exception.MethodInvocationException;
@@ -303,6 +304,7 @@
         buffer.append("\n");
         buffer.append(getStackTraceAsString());
         buffer.append("\n");
+        /*
         List list = XWikiBatcher.getSQLStats().getRecentSqlList();
         if (list.size() > 0) {
             buffer.append("Recent SQL:\n");
@@ -311,6 +313,7 @@
                 buffer.append("\n");
             }
         }
+        */
         return buffer.toString();
     }
 

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java	2006-08-05 07:53:44 UTC (rev 1119)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java	2006-08-05 08:07:49 UTC (rev 1120)
@@ -1446,7 +1446,7 @@
             } catch (Exception e) {
                 // If the rendering fails lets forget backlinks without errors
             }
-                
+
             List links = (List)context.get("links");
 
             if (links != null){
@@ -2036,14 +2036,16 @@
             return ArrayUtils.contains(validtypes, name);
     }
 
+
     public XWikiBatcherStats getBatcherStats() {
-        return XWikiBatcher.getSQLStats();
+        return null; // XWikiBatcher.getSQLStats();
     }
 
     public void resetBatcherStats() {
-        XWikiBatcher.getSQLStats().resetStats();
+        // XWikiBatcher.getSQLStats().resetStats();
     }
 
+
     public List searchDocumentsNames(String wheresql, XWikiContext context) throws XWikiException {
         return searchDocumentsNames(wheresql, 0, 0, "", context);
     }

Modified: xwiki/trunk/src/test/java/com/xpn/xwiki/test/HibernateTestCase.java
===================================================================
--- xwiki/trunk/src/test/java/com/xpn/xwiki/test/HibernateTestCase.java	2006-08-05 07:53:44 UTC (rev 1119)
+++ xwiki/trunk/src/test/java/com/xpn/xwiki/test/HibernateTestCase.java	2006-08-05 08:07:49 UTC (rev 1120)
@@ -68,7 +68,7 @@
         this.context.setWiki(this.xwiki);
 
         cleanUp(this.xwiki.getHibernateStore(), false, true, this.context);
-        iCount = this.xwiki.getHibernateStore().getBatcherStats().getPreparedSQLCounter();
+        // iCount = this.xwiki.getHibernateStore().getBatcherStats().getPreparedSQLCounter();
 
         this.xwiki.flushCache();