Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1535485 - in /cxf/trunk/rt/bindings/corba/src:
 main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java
 test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
Date: Thu, 24 Oct 2013 18:33:29 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
Message-Id: <20131024183329.58A8723889BB@eris.apache.org>

Author: dkulp
Date: Thu Oct 24 18:33:28 2013
New Revision: 1535485

URL: http://svn.apache.org/r1535485
Log:
[CXF-5357] - Fix handling of bound character array

CorbaStreamWriter.writeCharacters(char[], int, int) was constructing
wrong String from defined range of characters.

Patch from Grzegorz Grzybek applied

Added:
    cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java   (with props)
Modified:
    cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java

Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java?rev=1535485&r1=1535484&r2=1535485&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java Thu Oct 24 18:33:28 2013
@@ -277,7 +277,7 @@ public class CorbaStreamWriter implement
                                 int start,
                                 int len)
         throws XMLStreamException {
-        currentTypeListener.processCharacters(new String(text));
+        currentTypeListener.processCharacters(new String(text, start, len));
     }
 
     public java.lang.String getPrefix(java.lang.String uri)

Added: cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java?rev=1535485&view=auto
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java (added)
+++ cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java Thu Oct 24 18:33:28 2013
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.binding.corba.runtime;
+
+import javax.xml.stream.XMLStreamException;
+
+import org.apache.cxf.binding.corba.types.AbstractCorbaTypeListener;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class CorbaStreamWriterTest extends Assert {
+
+    @Test
+    public void writeCharactersTest() throws XMLStreamException {
+        CorbaStreamWriter writer = new CorbaStreamWriter(null, null, null);
+        final String[] pointer = new String[1];
+
+        writer.currentTypeListener = new AbstractCorbaTypeListener(null) {
+            @Override
+            public void processCharacters(String text) {
+                pointer[0] = text;
+            }
+        };
+
+        writer.writeCharacters("abcdefghijklmnopqrstuvwxyz".toCharArray(), 0, 4);
+        assertEquals("abcd", pointer[0]);
+    }
+
+}

Propchange: cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
------------------------------------------------------------------------------
    svn:eol-style = native