You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/04/29 18:15:05 UTC
tomee git commit: TOMEE-1791 properties-provider is the actual
expected attribute name
Repository: tomee
Updated Branches:
refs/heads/master 012f0b333 -> 3b598761a
TOMEE-1791 properties-provider is the actual expected attribute name
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/3b598761
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/3b598761
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/3b598761
Branch: refs/heads/master
Commit: 3b598761ac7921480516c4fa83a81be9aca97f5c
Parents: 012f0b3
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Fri Apr 29 18:14:19 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Fri Apr 29 18:14:53 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/config/sys/StackHandler.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/3b598761/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java
index 77c0c49..a26c64f 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java
@@ -225,6 +225,9 @@ public class StackHandler extends DefaultHandler {
service.setPostConstruct(attributes.getValue("post-construct"));
service.setPreDestroy(attributes.getValue("pre-destroy"));
service.setPropertiesProvider(attributes.getValue("property-provider"));
+ if (service.getPropertiesProvider() == null) {
+ service.setPropertiesProvider(attributes.getValue("properties-provider"));
+ }
final String aliases = attributes.getValue("aliases");
if (aliases != null) {