Return-Path: 
 <cvs-return-29178-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 2880 invoked from network); 14 Dec 2006 08:12:56 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 14 Dec 2006 08:12:56 -0000
Received: (qmail 1233 invoked by uid 500); 14 Dec 2006 08:13:03 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 1183 invoked by uid 500); 14 Dec 2006 08:13:03 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 1172 invoked by uid 99); 14 Dec 2006 08:13:03 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Dec 2006 00:13:03 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Dec 2006 00:12:55 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id C2F4E1A981A; Thu, 14 Dec 2006 00:12:09 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r487118 - in /cocoon/branches/BRANCH_2_1_X:
 src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/PersistenceFlow.java
 status.xml
Date: Thu, 14 Dec 2006 08:12:09 -0000
To: cvs@cocoon.apache.org
From: cziegeler@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061214081209.C2F4E1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: cziegeler
Date: Thu Dec 14 00:12:09 2006
New Revision: 487118

URL: http://svn.apache.org/viewvc?view=rev&rev=487118
Log:
Javaflow OJB Sample: Fix "No method 'showEmployee' found".

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/PersistenceFlow.java
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/PersistenceFlow.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/PersistenceFlow.java?view=diff&rev=487118&r1=487117&r2=487118
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/PersistenceFlow.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/PersistenceFlow.java Thu Dec 14 00:12:09 2006
@@ -128,7 +128,8 @@
     public void doShowEmployee() {
         // Query all objects
         ArrayList results = new ArrayList();
-        QueryByCriteria query = new QueryByCriteria(Employee.class, new Criteria());
+        // new Employee().getClass() is a fix for bug COCOON-1969
+        QueryByCriteria query = new QueryByCriteria(new Employee().getClass(), new Criteria());
         for(Iterator i=broker.getCollectionByQuery(query).iterator(); i.hasNext();) {
             results.add(i.next());
         }

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?view=diff&rev=487118&r1=487117&r2=487118
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Thu Dec 14 00:12:09 2006
@@ -184,6 +184,9 @@
   <release version="@version@" date="@date@">
 -->
   <release version="2.1.10" date="TBD">
+   <action dev="CZ" type="fix" fixes-bug="COCOON-1969" due-to="Jeroen Reijn">
+      Javaflow OJB Sample: Fix "No method 'showEmployee' found".
+   </action>
    <action dev="CZ" type="fix" fixes-bug="COCOON-1970" due-to="Jeroen Reijn">
       The JavaFlow OJB sample overwrote the first entry on insert instead of adding a new entry.
       This has been fixed.