qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject svn commit: r1723138 - in /qpid/java/branches/6.0.x: ./ common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java
Date Tue, 05 Jan 2016 17:35:22 GMT
Author: orudyy
Date: Tue Jan  5 17:35:21 2016
New Revision: 1723138

URL: http://svn.apache.org/viewvc?rev=1723138&view=rev
Log:
QPID-6968: QPID-6968: Fix setting of position in org.apache.qpid.bytebuffer.QpidByteBuffer.BufferDataInput#reset

           Merged from trunk using:
           svn merge -c r1723064 https://svn.apache.org/repos/asf/qpid/java/trunk

Modified:
    qpid/java/branches/6.0.x/   (props changed)
    qpid/java/branches/6.0.x/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java

Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan  5 17:35:21 2016
@@ -9,5 +9,5 @@
 /qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
 /qpid/branches/java-network-refactor/qpid/java:805429-821809
 /qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401,1717446,1717449,1717626,1717691,1717735,1717780,1718744
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401,1717446,1717449,1717626,1717691,1717735,1717780,1718744,1723064
 /qpid/trunk/qpid:796646-796653

Modified: qpid/java/branches/6.0.x/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java?rev=1723138&r1=1723137&r2=1723138&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java
(original)
+++ qpid/java/branches/6.0.x/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java
Tue Jan  5 17:35:21 2016
@@ -30,6 +30,7 @@ import java.nio.channels.GatheringByteCh
 import java.nio.channels.ReadableByteChannel;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
@@ -906,7 +907,7 @@ public final class QpidByteBuffer
 
         public void reset()
         {
-            _buffer.position(_mark);
+            position(_mark);
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message