Skip to content

Commit 7342dcd

Browse files
committed
fix
1 parent 6357c6a commit 7342dcd

3 files changed

Lines changed: 7 additions & 8 deletions

File tree

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GatewayProtectedCacheProxy.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,7 @@ public void setCacheManager(org.apache.ignite.cache.CacheManager cacheMgr) {
261261
CacheOperationGate opGate = onEnter();
262262

263263
try {
264-
return new GatewayProtectedCacheProxy<>((IgniteCacheProxy<K1, V1>)delegate,
265-
opCtx.keepBinary(), lock);
264+
return new GatewayProtectedCacheProxy<>((IgniteCacheProxy<K1, V1>)delegate, opCtx.keepBinary(), lock);
266265
}
267266
finally {
268267
onLeave(opGate);

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage {
5050
private static final int SKIP_READ_THROUGH_FLAG_MASK = 0x08;
5151

5252
/** Handle binary in interceptor operation flag bit mask. */
53-
private static final int HANDLE_BINARY_INTERCEPTOR_FLAG_MASK = 0x10;
53+
private static final int KEEP_BINARY_INTERCEPTOR_FLAG_MASK = 0x10;
5454

5555
/** Sender node ID. */
5656
@Order(0)
@@ -269,14 +269,14 @@ public boolean skipReadThrough() {
269269

270270
/** Sets flag indicating whether to handle binary in interceptor. */
271271
public void keepBinaryInInterceptor(boolean handleBinary) {
272-
setFlag(handleBinary, HANDLE_BINARY_INTERCEPTOR_FLAG_MASK);
272+
setFlag(handleBinary, KEEP_BINARY_INTERCEPTOR_FLAG_MASK);
273273
}
274274

275275
/**
276276
* @return Flag indicating whether to handle binary in interceptor.
277277
*/
278278
public boolean keepBinaryInInterceptor() {
279-
return isFlag(HANDLE_BINARY_INTERCEPTOR_FLAG_MASK);
279+
return isFlag(KEEP_BINARY_INTERCEPTOR_FLAG_MASK);
280280
}
281281

282282
/**

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
9494
private static final int TX_ENTRY_SKIP_READ_THROUGH_FLAG_MASK = 1 << 5;
9595

9696
/** Handle binary in interceptor operation bit mask. */
97-
private static final int HANDLE_BINARY_INTERCEPTOR_FLAG_MASK = 1 << 6;
97+
private static final int KEEP_BINARY_INTERCEPTOR_FLAG_MASK = 1 << 6;
9898

9999
/** Prepared flag updater. */
100100
private static final AtomicIntegerFieldUpdater<IgniteTxEntry> PREPARED_UPD =
@@ -634,14 +634,14 @@ public boolean skipReadThrough() {
634634
* @param handleBinary Handle binary in interceptor flag.
635635
*/
636636
public void keepBinaryInInterceptor(boolean handleBinary) {
637-
setFlag(handleBinary, HANDLE_BINARY_INTERCEPTOR_FLAG_MASK);
637+
setFlag(handleBinary, KEEP_BINARY_INTERCEPTOR_FLAG_MASK);
638638
}
639639

640640
/**
641641
* @return Handle binary in interceptor operation flag.
642642
*/
643643
public boolean keepBinaryInInterceptor() {
644-
return isFlag(HANDLE_BINARY_INTERCEPTOR_FLAG_MASK);
644+
return isFlag(KEEP_BINARY_INTERCEPTOR_FLAG_MASK);
645645
}
646646

647647
/**

0 commit comments

Comments
 (0)