You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by cu...@apache.org on 2009/10/16 18:01:14 UTC
svn commit: r825970 - in /openjpa/sandboxes/perf:
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestBrokerImpl.java
Author: curtisr7
Date: Fri Oct 16 16:01:14 2009
New Revision: 825970
URL: http://svn.apache.org/viewvc?rev=825970&view=rev
Log:
OLE verbose message suppression.
Added:
openjpa/sandboxes/perf/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestBrokerImpl.java (with props)
Modified:
openjpa/sandboxes/perf/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
Modified: openjpa/sandboxes/perf/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/perf/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java?rev=825970&r1=825969&r2=825970&view=diff
==============================================================================
--- openjpa/sandboxes/perf/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java (original)
+++ openjpa/sandboxes/perf/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java Fri Oct 16 16:01:14 2009
@@ -219,6 +219,7 @@
private int _detachState = DETACH_LOADED;
private boolean _detachedNew = true;
private boolean _orderDirty = false;
+ private boolean _suppressBatchOleLogging = false;
// status
private int _flags = 0;
@@ -758,6 +759,12 @@
_transCallbackMode);
}
+ public void setSuppressBatchOleLogging(boolean b) {
+ _suppressBatchOleLogging = b;
+ }
+ public boolean getSuppressBatchOleLogging(boolean b) {
+ return _suppressBatchOleLogging;
+ }
///////////
// Lookups
///////////
@@ -2156,8 +2163,15 @@
failed.add(f);
}
}
- if (opt && !failed.isEmpty())
- return new OptimisticException(failed, t);
+ if (opt && !failed.isEmpty()) {
+ if(_suppressBatchOleLogging == true){
+ String str = "Suppressing " + t.length + " exceptions.";
+ return new OptimisticException(str);
+ }else{
+ return new OptimisticException(failed, t);
+ }
+
+ }
if (opt)
return new OptimisticException(t);
return new StoreException(_loc.get("rolled-back")).
@@ -4752,4 +4766,5 @@
throw new ObjectExistsException(_loc.get("cache-exists",
obj.getClass().getName(), id)).setFailedObject(obj);
}
+
}
Added: openjpa/sandboxes/perf/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestBrokerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/perf/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestBrokerImpl.java?rev=825970&view=auto
==============================================================================
--- openjpa/sandboxes/perf/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestBrokerImpl.java (added)
+++ openjpa/sandboxes/perf/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestBrokerImpl.java Fri Oct 16 16:01:14 2009
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence.jdbc.kernel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.RollbackException;
+
+import org.apache.openjpa.persistence.simple.NamedEntity;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
+
+public class TestBrokerImpl extends SingleEMFTestCase {
+
+ public void setUp() {
+ setUp(CLEAR_TABLES, NamedEntity.class, "openjpa.FetchBatchSize", 100, "openjpa.BrokerImpl",
+ "SuppressBatchOleLogging=true");
+ }
+
+ public void test() {
+ EntityManager em1 = emf.createEntityManager();
+ EntityManager em2 = emf.createEntityManager();
+ List<NamedEntity> entities = new ArrayList<NamedEntity>();
+ em1.getTransaction().begin();
+ for (int i = 0; i < 75; i++) {
+ NamedEntity e = new NamedEntity();
+ entities.add(e);
+ em1.persist(e);
+ }
+
+ em1.getTransaction().commit();
+
+ try {
+ em1.getTransaction().begin();
+ em2.getTransaction().begin();
+ for (NamedEntity e : entities) {
+ em1.find(NamedEntity.class, e.getId()).setName("udpated!");
+ em2.find(NamedEntity.class, e.getId()).setName("udpated!_2");
+ }
+
+ em1.getTransaction().commit();
+ em2.getTransaction().commit();
+ } catch (RollbackException ole) {
+ ole.printStackTrace();
+ String msg = ole.getCause().getMessage();
+ if (msg.contains("NamedEntity")) {
+ fail("Shouldn't have found any Entity information in the OLE message");
+ }
+ }
+ }
+
+}
Propchange: openjpa/sandboxes/perf/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestBrokerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native