You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2020/10/17 18:56:33 UTC

[uima-uimaj] branch master updated (b4738b4 -> f059176)

This is an automated email from the ASF dual-hosted git repository.

rec pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.


    from b4738b4  Merge pull request #70 from apache/NO-JIRA-Fix-build-on-Windows-nodes-master
     new b264ace  Clearing isBeforeV3 flag in BinaryCasSerDes clear method, otherwise this flag would remain its intial value when the CAS is recycled, which caused deserialization issues in sessions where mixed v2 and v3 CAS'es were loaded.
     new 93df336  Initialising the isBeforeV3 flag later in the reinit method of BinaryCasSerDes, since it could be reset to false when the delta flag is false, and this can cause failures during loading of earlier CAS versions than v3. The isBeforeV3 flag is not accessed before deserializeAfterVersion is invoked, and this only occurs inside this reinit method, so this additional change should not cause any unwanted side effects.
     new a141ae7  [UIMA-6273] isBeforeV3 variable not reset in BinaryCasSerDes
     new 6acfd94  Merge branch 'master' into UIMA-6273-isBeforeV3-variable-not-reset-in-BinaryCasSerDes
     new f059176  Merge pull request #66 from mjunsilo/UIMA-6273-isBeforeV3-variable-not-reset-in-BinaryCasSerDes

The 6890 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/uima/cas/impl/BinaryCasSerDes.java  |  15 +--
 .../uima/cas/impl/UimaV2CasCompatibilityTest.java  | 140 +++++++++++++++++++++
 .../test/resources/uima-v2-serialized-cas/README   |   1 +
 .../uima-v2-serialized-cas/simpleCas.bins          | Bin 0 -> 6759 bytes
 .../uima-v2-serialized-cas/simpleCas.bins0         | Bin 0 -> 12416 bytes
 .../uima-v2-serialized-cas/simpleCas.bins4         | Bin 0 -> 2839 bytes
 .../uima-v2-serialized-cas/simpleCas.bins6         | Bin 0 -> 2839 bytes
 .../uima-v2-serialized-cas/simpleCas.bins6p        | Bin 0 -> 9507 bytes
 .../uima-v2-serialized-cas/simpleCas.bins6pTs      | Bin 0 -> 8873 bytes
 .../uima-v2-serialized-cas/simpleCas.binsp         | Bin 0 -> 13536 bytes
 .../uima-v2-serialized-cas/simpleCas.xcas          |  20 +++
 .../simpleCas.xmi                                  |  96 +++++---------
 .../test/resources/uima-v3-serialized-cas/README   |   1 +
 .../uima-v3-serialized-cas/simpleCas.bins          | Bin 0 -> 6759 bytes
 .../uima-v3-serialized-cas/simpleCas.bins0         | Bin 0 -> 12416 bytes
 .../uima-v3-serialized-cas/simpleCas.bins4         | Bin 0 -> 2843 bytes
 .../uima-v3-serialized-cas/simpleCas.bins6         | Bin 0 -> 2843 bytes
 .../uima-v3-serialized-cas/simpleCas.bins6p        | Bin 0 -> 9499 bytes
 .../uima-v3-serialized-cas/simpleCas.bins6pTs      | Bin 0 -> 8865 bytes
 .../uima-v3-serialized-cas/simpleCas.binsp         | Bin 0 -> 13524 bytes
 .../uima-v3-serialized-cas/simpleCas.xcas          |  20 +++
 .../resources/uima-v3-serialized-cas/simpleCas.xmi |   1 +
 22 files changed, 223 insertions(+), 71 deletions(-)
 create mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/impl/UimaV2CasCompatibilityTest.java
 create mode 100644 uimaj-core/src/test/resources/uima-v2-serialized-cas/README
 create mode 100644 uimaj-core/src/test/resources/uima-v2-serialized-cas/simpleCas.bins
 create mode 100644 uimaj-core/src/test/resources/uima-v2-serialized-cas/simpleCas.bins0
 create mode 100644 uimaj-core/src/test/resources/uima-v2-serialized-cas/simpleCas.bins4
 create mode 100644 uimaj-core/src/test/resources/uima-v2-serialized-cas/simpleCas.bins6
 create mode 100644 uimaj-core/src/test/resources/uima-v2-serialized-cas/simpleCas.bins6p
 create mode 100644 uimaj-core/src/test/resources/uima-v2-serialized-cas/simpleCas.bins6pTs
 create mode 100644 uimaj-core/src/test/resources/uima-v2-serialized-cas/simpleCas.binsp
 create mode 100644 uimaj-core/src/test/resources/uima-v2-serialized-cas/simpleCas.xcas
 copy uimaj-core/src/test/resources/{ExampleCas => uima-v2-serialized-cas}/simpleCas.xmi (70%)
 create mode 100644 uimaj-core/src/test/resources/uima-v3-serialized-cas/README
 create mode 100644 uimaj-core/src/test/resources/uima-v3-serialized-cas/simpleCas.bins
 create mode 100644 uimaj-core/src/test/resources/uima-v3-serialized-cas/simpleCas.bins0
 create mode 100644 uimaj-core/src/test/resources/uima-v3-serialized-cas/simpleCas.bins4
 create mode 100644 uimaj-core/src/test/resources/uima-v3-serialized-cas/simpleCas.bins6
 create mode 100644 uimaj-core/src/test/resources/uima-v3-serialized-cas/simpleCas.bins6p
 create mode 100644 uimaj-core/src/test/resources/uima-v3-serialized-cas/simpleCas.bins6pTs
 create mode 100644 uimaj-core/src/test/resources/uima-v3-serialized-cas/simpleCas.binsp
 create mode 100644 uimaj-core/src/test/resources/uima-v3-serialized-cas/simpleCas.xcas
 create mode 100644 uimaj-core/src/test/resources/uima-v3-serialized-cas/simpleCas.xmi