You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2016/07/25 06:47:33 UTC
svn commit: r1753953 -
/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java
Author: pkluegl
Date: Mon Jul 25 06:47:33 2016
New Revision: 1753953
URL: http://svn.apache.org/viewvc?rev=1753953&view=rev
Log:
UIMA-4685
- no header for serialized formats
Modified:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java?rev=1753953&r1=1753952&r2=1753953&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java Mon Jul 25 06:47:33 2016
@@ -305,10 +305,9 @@ public class CasIOUtils {
return SerialFormat.BINARY;
} else {
// read additional header again
- CommonSerDes.readHeader(dis);
ObjectInputStream ois = new ObjectInputStream(dis);
Object object = ois.readObject();
- if (object instanceof CASCompleteSerializer && header.isTypeSystemIncluded()) {
+ if (object instanceof CASCompleteSerializer) {
CASCompleteSerializer serializer = (CASCompleteSerializer) object;
deserializeCASComplete(serializer, (CASImpl) aCAS);
return SerialFormat.SERIALIZED_TS;
@@ -408,8 +407,6 @@ public class CasIOUtils {
case SERIALIZED:
// Java-serialized CAS without type system
{
- Header additionalHeader = CommonSerDes.createHeader();
- additionalHeader.write(dos);
CASSerializer serializer = new CASSerializer();
serializer.addCAS((CASImpl) aCas);
ObjectOutputStream objOS = new ObjectOutputStream(docOS);
@@ -420,8 +417,6 @@ public class CasIOUtils {
case SERIALIZED_TS:
// Java-serialized CAS with type system
{
- Header additionalHeader = CommonSerDes.createHeader().typeSystemIncluded();
- additionalHeader.write(dos);
ObjectOutputStream objOS = new ObjectOutputStream(docOS);
CASCompleteSerializer serializer = serializeCASComplete((CASImpl) aCas);
objOS.writeObject(serializer);