Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 31737 invoked from network); 8 Dec 2003 10:09:57 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 8 Dec 2003 10:09:57 -0000 Received: (qmail 23502 invoked by uid 500); 8 Dec 2003 10:09:31 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 23445 invoked by uid 500); 8 Dec 2003 10:09:30 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 23434 invoked by uid 500); 8 Dec 2003 10:09:30 -0000 Delivered-To: apmail-cocoon-2.2-cvs@apache.org Received: (qmail 23431 invoked from network); 8 Dec 2003 10:09:30 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 8 Dec 2003 10:09:30 -0000 Received: (qmail 31701 invoked by uid 1260); 8 Dec 2003 10:09:56 -0000 Date: 8 Dec 2003 10:09:56 -0000 Message-ID: <20031208100956.31700.qmail@minotaur.apache.org> From: cziegeler@apache.org To: cocoon-2.2-cvs@apache.org Subject: cvs commit: cocoon-2.2/src/java/org/apache/cocoon/generation JXTemplateGenerator.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N cziegeler 2003/12/08 02:09:56 Modified: src/java/org/apache/cocoon/generation JXTemplateGenerator.java Log: Syncing - Please don't forget this when committing to 2.1! Revision Changes Path 1.19 +2 -2 cocoon-2.2/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java Index: JXTemplateGenerator.java =================================================================== RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- JXTemplateGenerator.java 6 Dec 2003 21:22:08 -0000 1.18 +++ JXTemplateGenerator.java 8 Dec 2003 10:09:55 -0000 1.19 @@ -965,7 +965,7 @@ (org.apache.commons.jexl.Expression)compiled; return e.evaluate(jexlContext); } - return compiled; + return expr.raw; } catch (InvocationTargetException e) { Throwable t = e.getTargetException(); if (t instanceof Exception) {