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 CE8AB7A7C for ; Tue, 13 Dec 2011 09:32:39 +0000 (UTC) Received: (qmail 60455 invoked by uid 500); 13 Dec 2011 09:32:39 -0000 Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org Received: (qmail 60347 invoked by uid 500); 13 Dec 2011 09:32:39 -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 60340 invoked by uid 99); 13 Dec 2011 09:32:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Dec 2011 09:32:38 +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; Tue, 13 Dec 2011 09:32:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4896723888FD for ; Tue, 13 Dec 2011 09:32:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1213627 - /ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java Date: Tue, 13 Dec 2011 09:32:16 -0000 To: commits@ofbiz.apache.org From: jacopoc@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111213093216.4896723888FD@eris.apache.org> Author: jacopoc Date: Tue Dec 13 09:32:15 2011 New Revision: 1213627 URL: http://svn.apache.org/viewvc?rev=1213627&view=rev Log: Backported from rev. 955882 (by Scott Gray): Unnamed events in controller processor maps silently override each other (OFBIZ-3961) Modified: ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java Modified: ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java?rev=1213627&r1=1213626&r2=1213627&view=diff ============================================================================== --- ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java (original) +++ ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java Tue Dec 13 09:32:15 2011 @@ -177,7 +177,11 @@ public class ConfigXMLReader { Element firstvisitElement = UtilXml.firstChildElement(rootElement, "firstvisit"); if (firstvisitElement != null) { for (Element eventElement: UtilXml.childElementList(firstvisitElement, "event")) { - this.firstVisitEventList.put(eventElement.getAttribute("name"), new Event(eventElement)); + String eventName = eventElement.getAttribute("name"); + if (UtilValidate.isEmpty(eventName)) { + eventName = eventElement.getAttribute("type") + "::" + eventElement.getAttribute("path") + "::" + eventElement.getAttribute("invoke"); + } + this.firstVisitEventList.put(eventName, new Event(eventElement)); } } @@ -185,7 +189,11 @@ public class ConfigXMLReader { Element preprocessorElement = UtilXml.firstChildElement(rootElement, "preprocessor"); if (preprocessorElement != null) { for (Element eventElement: UtilXml.childElementList(preprocessorElement, "event")) { - this.preprocessorEventList.put(eventElement.getAttribute("name"), new Event(eventElement)); + String eventName = eventElement.getAttribute("name"); + if (UtilValidate.isEmpty(eventName)) { + eventName = eventElement.getAttribute("type") + "::" + eventElement.getAttribute("path") + "::" + eventElement.getAttribute("invoke"); + } + this.preprocessorEventList.put(eventName, new Event(eventElement)); } } @@ -193,7 +201,11 @@ public class ConfigXMLReader { Element postprocessorElement = UtilXml.firstChildElement(rootElement, "postprocessor"); if (postprocessorElement != null) { for (Element eventElement: UtilXml.childElementList(postprocessorElement, "event")) { - this.postprocessorEventList.put(eventElement.getAttribute("name"), new Event(eventElement)); + String eventName = eventElement.getAttribute("name"); + if (UtilValidate.isEmpty(eventName)) { + eventName = eventElement.getAttribute("type") + "::" + eventElement.getAttribute("path") + "::" + eventElement.getAttribute("invoke"); + } + this.postprocessorEventList.put(eventName, new Event(eventElement)); } } @@ -201,7 +213,11 @@ public class ConfigXMLReader { Element afterLoginElement = UtilXml.firstChildElement(rootElement, "after-login"); if (afterLoginElement != null) { for (Element eventElement: UtilXml.childElementList(afterLoginElement, "event")) { - this.afterLoginEventList.put(eventElement.getAttribute("name"), new Event(eventElement)); + String eventName = eventElement.getAttribute("name"); + if (UtilValidate.isEmpty(eventName)) { + eventName = eventElement.getAttribute("type") + "::" + eventElement.getAttribute("path") + "::" + eventElement.getAttribute("invoke"); + } + this.afterLoginEventList.put(eventName, new Event(eventElement)); } } @@ -209,7 +225,11 @@ public class ConfigXMLReader { Element beforeLogoutElement = UtilXml.firstChildElement(rootElement, "before-logout"); if (beforeLogoutElement != null) { for (Element eventElement: UtilXml.childElementList(beforeLogoutElement, "event")) { - this.beforeLogoutEventList.put(eventElement.getAttribute("name"), new Event(eventElement)); + String eventName = eventElement.getAttribute("name"); + if (UtilValidate.isEmpty(eventName)) { + eventName = eventElement.getAttribute("type") + "::" + eventElement.getAttribute("path") + "::" + eventElement.getAttribute("invoke"); + } + this.beforeLogoutEventList.put(eventName, new Event(eventElement)); } } }