Skip to content

Commit 22a739c

Browse files
committed
fixed tests
1 parent c735a54 commit 22a739c

5 files changed

Lines changed: 16 additions & 7 deletions

File tree

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerifyResult.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,11 @@ public Collection<GridCacheVersion> partiallyCommittedTxs() {
101101

102102
/** {@inheritDoc} */
103103
@Override public void finishUnmarshal(Marshaller marsh, ClassLoader clsLdr) throws IgniteCheckedException {
104-
txHashRes = U.unmarshal(marsh, txHashResBytes, clsLdr);
105-
partHashRes = U.unmarshal(marsh, partHashResBytes, clsLdr);
104+
if (txHashResBytes != null)
105+
txHashRes = U.unmarshal(marsh, txHashResBytes, clsLdr);
106+
107+
if (partHashResBytes != null)
108+
partHashRes = U.unmarshal(marsh, partHashResBytes, clsLdr);
106109
}
107110

108111
/** {@inheritDoc} */

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckPartitionHashesResponse.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ public Map<String, Map<PartitionKey, PartitionHashRecord>> perMetaResults() {
5858

5959
/** {@inheritDoc} */
6060
@Override public void finishUnmarshal(Marshaller marsh, ClassLoader clsLdr) throws IgniteCheckedException {
61-
perMetaResults = U.unmarshal(marsh, perMetaResultsBytes, clsLdr);
61+
if (perMetaResultsBytes != null)
62+
perMetaResults = U.unmarshal(marsh, perMetaResultsBytes, clsLdr);
6263
}
6364

6465
/** {@inheritDoc} */

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadataResponse.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ public List<SnapshotMetadata> metadata() {
5757

5858
/** {@inheritDoc} */
5959
@Override public void finishUnmarshal(Marshaller marsh, ClassLoader clsLdr) throws IgniteCheckedException {
60-
metadata = U.unmarshal(marsh, metadataBytes, clsLdr);
60+
if (metadataBytes != null)
61+
metadata = U.unmarshal(marsh, metadataBytes, clsLdr);
6162
}
6263

6364
/** {@inheritDoc} */

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandlerResponse.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ public Map<PartitionKey, PartitionHashRecord> response() {
6060

6161
/** {@inheritDoc} */
6262
@Override public void finishUnmarshal(Marshaller marsh, ClassLoader clsLdr) throws IgniteCheckedException {
63-
res = U.unmarshal(jdk(), resBytes, U.gridClassLoader());
63+
if (resBytes != null)
64+
res = U.unmarshal(jdk(), resBytes, U.gridClassLoader());
6465
}
6566

6667
/** {@inheritDoc} */

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreOperationResponse.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,11 @@ public List<SnapshotMetadata> metadata() {
7979

8080
/** {@inheritDoc} */
8181
@Override public void finishUnmarshal(Marshaller marsh, ClassLoader clsLdr) throws IgniteCheckedException {
82-
ccfgs = U.unmarshal(marsh, ccfgsBytes, clsLdr);
83-
metas = U.unmarshal(marsh, metasBytes, clsLdr);
82+
if (ccfgsBytes != null)
83+
ccfgs = U.unmarshal(marsh, ccfgsBytes, clsLdr);
84+
85+
if (metasBytes != null)
86+
metas = U.unmarshal(marsh, metasBytes, clsLdr);
8487
}
8588

8689
/** {@inheritDoc} */

0 commit comments

Comments
 (0)