Return-Path: X-Original-To: apmail-ofbiz-commits-archive@www.apache.org Delivered-To: apmail-ofbiz-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 36060E357 for ; Mon, 3 Dec 2012 13:15:14 +0000 (UTC) Received: (qmail 8002 invoked by uid 500); 3 Dec 2012 13:15:14 -0000 Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org Received: (qmail 7821 invoked by uid 500); 3 Dec 2012 13:15:12 -0000 Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ofbiz.apache.org Delivered-To: mailing list commits@ofbiz.apache.org Received: (qmail 7810 invoked by uid 99); 3 Dec 2012 13:15:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Dec 2012 13:15:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Dec 2012 13:15:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 46F9A23888E7; Mon, 3 Dec 2012 13:14:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1416499 - in /ofbiz/branches/release11.04: ./ framework/widget/src/org/ofbiz/widget/cache/AbstractCache.java Date: Mon, 03 Dec 2012 13:14:49 -0000 To: commits@ofbiz.apache.org From: jacopoc@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121203131449.46F9A23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jacopoc Date: Mon Dec 3 13:14:48 2012 New Revision: 1416499 URL: http://svn.apache.org/viewvc?rev=1416499&view=rev Log: Applied fix from trunk for revision: 1416497 === Fixed code that was broken a lot of time ago by commit 883226; this prevented the (seldom used) screen.use-cache attribute to work properly. Thanks to K Sharad Bhushan for the patch (OFBIZ-5080). Modified: ofbiz/branches/release11.04/ (props changed) ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/cache/AbstractCache.java Propchange: ofbiz/branches/release11.04/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1416497 Modified: ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/cache/AbstractCache.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/cache/AbstractCache.java?rev=1416499&r1=1416498&r2=1416499&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/cache/AbstractCache.java (original) +++ ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/cache/AbstractCache.java Mon Dec 3 13:14:48 2012 @@ -50,6 +50,6 @@ public abstract class AbstractCache { protected UtilCache getOrCreateCache(String widgetName) { String name = getCacheName(widgetName); - return UtilCache.getOrCreateUtilCache(widgetName, 0, 0, 0, true, false, name); + return UtilCache.getOrCreateUtilCache(name, 0, 0, 0, true, false, name); } }