Modified: openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_conf.xml URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_conf.xml?rev=1243702&r1=1243701&r2=1243702&view=diff ============================================================================== --- openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_conf.xml (original) +++ openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_conf.xml Mon Feb 13 21:23:54 2012 @@ -3427,43 +3427,6 @@ levels are equivalent. Lock levels <lite <para> The following properties apply exclusively to the OpenJPA JDBC back-end. </para> - - <section id="openjpa.jdbc.CachesSelect"> - <title> - openjpa.jdbc.CachesSelect - </title> - <indexterm zone="openjpa.jdbc.CachesSelect"> - <primary> - Select Cache - </primary> - </indexterm> - <indexterm zone="openjpa.jdbc.CachesSelect"> - <primary> - caching - </primary> - <secondary> - Select Cache - </secondary> - </indexterm> - <para> -<emphasis role="bold">Property name:</emphasis> -<literal>openjpa.jdbc.CachesSelect</literal> - </para> - <para> -<emphasis role="bold">Resource adaptor config-property:</emphasis> -<literal>CachesSelect</literal> - </para> - <para> -<emphasis role="bold">Default:</emphasis> <literal>false</literal>. - </para> - <para> -<emphasis role="bold">Description:</emphasis> A plugin string (see -<xref linkend="ref_guide_conf_plugins"/>) describing the options to reuse SQL SELECT -statements generated to load persistent entity and its relations. -See <xref linkend="ref_guide_cache_select"/> for details. - </para> - </section> - <section id="openjpa.jdbc.ConnectionDecorators"> <title> openjpa.jdbc.ConnectionDecorators
Modified: openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/SliceThread.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/SliceThread.java?rev=1243702&r1=1243701&r2=1243702&view=diff ============================================================================== --- openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/SliceThread.java (original) +++ openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/SliceThread.java Mon Feb 13 21:23:54 2012 @@ -50,36 +50,6 @@ public class SliceThread extends Thread return _parent; } - /** - * This thread equals itself (of course), its parent and any of its siblings. - * Essentially all slice threads are equal. - * <br> - * Note: this definition of equality breaks the core definition i.e. if - * <tt>P</tt> is parent thread of a slice child <tt>S</tt>, then - * <tt>S.equals(P)</tt>, but <em>not</em> <tt>P.equals(S)</tt>. - */ - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (other instanceof SliceThread) { - return ((SliceThread)other)._parent == this._parent; - } - return this._parent == other; - } - - /** - * Hash code of this thread is same as its parent. - */ - @Override - public int hashCode() { - return _parent.hashCode(); - } - - @Override - public String toString() { - return '[' + getClass().getSimpleName() + '-'+ getName() + " child of " + _parent + ']'; - } - /** * Create a cached pool of <em>slice</em> threads. * The thread factory creates specialized threads for preferential locking treatment. Modified: openjpa/trunk/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestBasic.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestBasic.java?rev=1243702&r1=1243701&r2=1243702&view=diff ============================================================================== --- openjpa/trunk/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestBasic.java (original) +++ openjpa/trunk/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestBasic.java Mon Feb 13 21:23:54 2012 @@ -356,18 +356,5 @@ public class TestBasic extends SliceTest assertNotNull(newP); assertEquals("newslice", SlicePersistence.getSlice(newP)); } - - public void testSliceThreadEqualsParentAndSiblings() { - Thread parent = new Thread(); - SliceThread s1 = new SliceThread(parent, null); - SliceThread s2 = new SliceThread(parent, null); - - assertEquals(s1, parent); - assertEquals(s2, parent); - assertEquals(s1, s2); - assertNotSame(parent, s1); - assertNotSame(parent, s2); - assertNotSame(s1, s2); - } }
