[ignite] branch master updated: IGNITE-13088 Avoid NPE being thrown from checkProxyIsValid on client restart - Fixes #7873.

[ilyak]

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

ilyak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 657c50ab IGNITE-13088 Avoid NPE being thrown from checkProxyIsValid on 
client restart - Fixes #7873.
657c50ab is described below

commit 657c50abd806d7b811fee16a342cc650197b1e75
Author: Ilya Kasnacheev <ilya.kasnach...@gmail.com>
AuthorDate: Mon Jun 8 12:12:08 2020 +0300

    IGNITE-13088 Avoid NPE being thrown from checkProxyIsValid on client 
restart - Fixes #7873.
    
    Signed-off-by: Ilya Kasnacheev <ilya.kasnach...@gmail.com>
---
 .../internal/processors/cache/GatewayProtectedCacheProxy.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GatewayProtectedCacheProxy.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GatewayProtectedCacheProxy.java
index 11b24aa..1b9e610 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GatewayProtectedCacheProxy.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GatewayProtectedCacheProxy.java
@@ -1599,11 +1599,13 @@ public class GatewayProtectedCacheProxy<K, V> extends 
AsyncSupportAdapter<Ignite
             IgniteCacheProxyImpl proxyImpl = (IgniteCacheProxyImpl) delegate;
 
             try {
-                IgniteInternalCache<K, V> cache = 
context().kernalContext().cache().<K, 
V>publicJCache(context().name()).internalProxy();
+                IgniteCacheProxy<K, V> proxy = 
context().kernalContext().cache().<K, V>publicJCache(context().name());
 
-                proxyImpl.opportunisticRestart(cache);
+                if (proxy != null) {
+                    proxyImpl.opportunisticRestart(proxy.internalProxy());
 
-                return gate();
+                    return gate();
+                }
             } catch (IgniteCheckedException ice) {
                 // Opportunity didn't work out.
             }