[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openejb-cvs
Subject:    tomee git commit: OPENEJB-2116 using ISO-8859-1 to read Definition properties, thanks Bodo Pfelzer f
From:       rmannibucau () apache ! org
Date:       2015-06-18 11:02:10
Message-ID: 28006d2aff1c40f3a713b6aa54517b93 () git ! apache ! org
[Download RAW message or body]

Repository: tomee
Updated Branches:
  refs/heads/master 4f49f2b36 -> c836ad8b0


OPENEJB-2116 using ISO-8859-1 to read Definition properties, thanks Bodo Pfelzer for \
this


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c836ad8b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c836ad8b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c836ad8b

Branch: refs/heads/master
Commit: c836ad8b08ca049d7676643cf4d6e759d60460d2
Parents: 4f49f2b
Author: Romain Manni-Bucau <rmannibucau@apache.org>
Authored: Thu Jun 18 12:58:39 2015 +0200
Committer: Romain Manni-Bucau <rmannibucau@apache.org>
Committed: Thu Jun 18 13:02:02 2015 +0200

----------------------------------------------------------------------
 .../java/org/apache/openejb/assembler/classic/Assembler.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/c836ad8b/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 4fc22b8..3b79535 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
 @@ -2722,8 +2722,10 @@ public class Assembler extends AssemblerTool implements \
org.apache.openejb.spi.A  
         final Properties props = \
PropertyPlaceHolderHelper.simpleHolds(serviceInfo.properties);  if \
(serviceInfo.properties.containsKey("Definition")) { +            final Object \
                encoding = serviceInfo.properties.remove("DefitionEncoding");
             try { // we catch classcast etc..., if it fails it is not important
-                final InputStream is = new \
ByteArrayInputStream(serviceInfo.properties.getProperty("Definition").getBytes()); +  \
final InputStream is = new \
ByteArrayInputStream(serviceInfo.properties.getProperty("Definition") +               \
.getBytes(encoding != null ? encoding.toString() : "ISO-8859-1"));  final Properties \
p = new SuperProperties();  IO.readProperties(is, p);
                 for (final Entry<Object, Object> entry : p.entrySet()) {


[prev in list] [next in list] [prev in thread] [next in thread]