ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1853728 - in /webservices/axiom/branches/1.2.x: ./ axiom-api/src/main/java/org/apache/axiom/blob/ axiom-api/src/test/java/org/apache/axiom/blob/suite/
Date Sat, 16 Feb 2019 20:59:53 GMT
Author: veithen
Date: Sat Feb 16 20:59:53 2019
New Revision: 1853728

URL: http://svn.apache.org/viewvc?rev=1853728&view=rev
Log:
AXIOM-495: Merge r1853727 to the 1.2 branch (with changes).

Added:
    webservices/axiom/branches/1.2.x/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestResetWithoutMark.java
      - copied, changed from r1853727, webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestResetWithoutMark.java
Modified:
    webservices/axiom/branches/1.2.x/   (props changed)
    webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlobInputStream.java
    webservices/axiom/branches/1.2.x/axiom-api/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestSuiteBuilder.java

Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 16 20:59:53 2019
@@ -14,4 +14,4 @@
 /webservices/axiom/branches/maven-site-plugin-3.5:1731125-1732708
 /webservices/axiom/branches/namespaceURIInterning:1293148-1293587
 /webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1747866,1758113,1762239,1762241,1762243,1762287,1777898,1781319,1781488,1787644,1790322,1791831,1795059,1795067,1795081,1796489,1796558,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1821701,1821707,1826041,1843069,1843073,1843075,1843350,1843517,1844631,1845037,1845039,1845623,1846359,1846362,1846368,1846677,1848452,1848486,1848490,1848720,1849251,1849743,1849758,1849791,1849806,1850517,1850796,1850798,1850800,1850810
+/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1747866,1758113,1762239,1762241,1762243,1762287,1777898,1781319,1781488,1787644,1790322,1791831,1795059,1795067,1795081,1796489,1796558,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1821701,1821707,1826041,1843069,1843073,1843075,1843350,1843517,1844631,1845037,1845039,1845623,1846359,1846362,1846368,1846677,1848452,1848486,1848490,1848720,1849251,1849743,1849758,1849791,1849806,1850517,1850796,1850798,1850800,1850810,1853727

Modified: webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlobInputStream.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlobInputStream.java?rev=1853728&r1=1853727&r2=1853728&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlobInputStream.java
(original)
+++ webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlobInputStream.java
Sat Feb 16 20:59:53 2019
@@ -28,7 +28,7 @@ final class MemoryBlobInputStream extend
     private int markIndex;
     
     MemoryBlobInputStream(MemoryBlobChunk firstChunk) {
-        chunk = firstChunk;
+        markChunk = chunk = firstChunk;
     }
 
     private void updateChunk() {

Copied: webservices/axiom/branches/1.2.x/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestResetWithoutMark.java
(from r1853727, webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestResetWithoutMark.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestResetWithoutMark.java?p2=webservices/axiom/branches/1.2.x/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestResetWithoutMark.java&p1=webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestResetWithoutMark.java&r1=1853727&r2=1853728&rev=1853728&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestResetWithoutMark.java
(original)
+++ webservices/axiom/branches/1.2.x/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestResetWithoutMark.java
Sat Feb 16 20:59:53 2019
@@ -29,7 +29,7 @@ import org.apache.axiom.blob.WritableBlo
 import org.apache.commons.io.IOUtils;
 
 public class TestResetWithoutMark extends WritableBlobTestCase {
-    public TestResetWithoutMark(WritableBlobFactory<?> factory) {
+    public TestResetWithoutMark(WritableBlobFactory factory) {
         super(factory, State.NEW);
     }
 

Modified: webservices/axiom/branches/1.2.x/axiom-api/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/axiom-api/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestSuiteBuilder.java?rev=1853728&r1=1853727&r2=1853728&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/axiom-api/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestSuiteBuilder.java
(original)
+++ webservices/axiom/branches/1.2.x/axiom-api/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestSuiteBuilder.java
Sat Feb 16 20:59:53 2019
@@ -57,6 +57,7 @@ public class WritableBlobTestSuiteBuilde
         addTest(new TestReadFromWithError(factory));
         addTest(new TestReadZeroLength(factory));
         addTest(new TestReleaseTwice(factory));
+        addTest(new TestResetWithoutMark(factory));
         addTest(new TestSkip(factory));
         addTest(new TestWriteAfterCommit(factory));
         addTest(new TestWriteToIllegalState(factory, State.NEW));



Mime
View raw message