Return-Path: X-Original-To: apmail-struts-commits-archive@minotaur.apache.org Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B801111012 for ; Sun, 6 Apr 2014 14:04:29 +0000 (UTC) Received: (qmail 92615 invoked by uid 500); 6 Apr 2014 14:03:51 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 92113 invoked by uid 500); 6 Apr 2014 14:03:38 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 90961 invoked by uid 99); 6 Apr 2014 14:03:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Apr 2014 14:03:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 30EFE94B9DD; Sun, 6 Apr 2014 14:03:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lukaszlenart@apache.org To: commits@struts.apache.org Date: Sun, 06 Apr 2014 14:03:42 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [29/50] [abbrv] git commit: WW-4289 Delegates initialisation of bean to Spring WW-4289 Delegates initialisation of bean to Spring Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e12262f0 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e12262f0 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e12262f0 Branch: refs/heads/master Commit: e12262f035109bfe18dc399f897aac6a1325f900 Parents: 272feec Author: Lukasz Lenart Authored: Fri Mar 28 15:38:45 2014 +0100 Committer: Lukasz Lenart Committed: Fri Mar 28 15:38:45 2014 +0100 ---------------------------------------------------------------------- .../java/com/opensymphony/xwork2/spring/SpringObjectFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/e12262f0/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java b/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java index 1ba7402..9ba065d 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java @@ -178,7 +178,7 @@ public class SpringObjectFactory extends ObjectFactory implements ApplicationCon } else { bean = autoWiringFactory.autowire(clazz, AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR, false); bean = autoWiringFactory.applyBeanPostProcessorsBeforeInitialization(bean, bean.getClass().getName()); - // We don't need to call the init-method since one won't be registered. + bean = autoWiringFactory.initializeBean(bean, bean.getClass().getName()); bean = autoWiringFactory.applyBeanPostProcessorsAfterInitialization(bean, bean.getClass().getName()); return autoWireBean(bean, autoWiringFactory); }