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/07/21 11:47:13 UTC
tomee git commit: TOMEE-1879 typo on DefinitionEncoding in Assembler,
thanks Svetlin Zarev
Repository: tomee
Updated Branches:
refs/heads/master f690cf89d -> 9477c607c
TOMEE-1879 typo on DefinitionEncoding in Assembler, thanks Svetlin Zarev
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9477c607
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9477c607
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9477c607
Branch: refs/heads/master
Commit: 9477c607c89f41b9f5501d8b57c3cb3e7964016a
Parents: f690cf8
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Thu Jul 21 13:46:57 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Thu Jul 21 13:46:57 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/openejb/assembler/classic/Assembler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/9477c607/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
index 1113442..4b34013 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
@@ -2917,7 +2917,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
if (serviceInfo.types.contains("DataSource") || serviceInfo.types.contains(DataSource.class.getName())) {
final Properties props = PropertyPlaceHolderHelper.simpleHolds(serviceInfo.properties);
if (serviceInfo.properties.containsKey("Definition")) {
- final Object encoding = serviceInfo.properties.remove("DefitionEncoding");
+ final Object encoding = serviceInfo.properties.remove("DefinitionEncoding");
try { // we catch classcast etc..., if it fails it is not important
final InputStream is = new ByteArrayInputStream(serviceInfo.properties.getProperty("Definition")
.getBytes(encoding != null ? encoding.toString() : "ISO-8859-1"));