You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by jo...@apache.org on 2019/04/18 12:37:14 UTC

[ignite] branch master updated: IGNITE-11773 Fixed JDBC suite hanging due to removed non-serializable proxy objects - Fixes #6477.

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

jokser 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 6403717  IGNITE-11773 Fixed JDBC suite hanging due to removed non-serializable proxy objects - Fixes #6477.
6403717 is described below

commit 6403717c505d50da1eafd57386ff440cd8a834df
Author: Pavel Kovalenko <jo...@gmail.com>
AuthorDate: Thu Apr 18 15:36:22 2019 +0300

    IGNITE-11773 Fixed JDBC suite hanging due to removed non-serializable proxy objects - Fixes #6477.
    
    Signed-off-by: Pavel Kovalenko <jo...@gmail.com>
---
 .../test/java/org/apache/ignite/jdbc/JdbcErrorsAbstractSelfTest.java | 5 +++++
 .../java/org/apache/ignite/jdbc/thin/JdbcThinAbstractSelfTest.java   | 5 +++++
 .../org/apache/ignite/testframework/junits/GridAbstractTest.java     | 4 +++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcErrorsAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcErrorsAbstractSelfTest.java
index 7235309..f8e745b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcErrorsAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcErrorsAbstractSelfTest.java
@@ -70,6 +70,11 @@ public abstract class JdbcErrorsAbstractSelfTest extends GridCommonAbstractTest
             .setInterceptor(new TestCacheInterceptor()));
     }
 
+    /** {@inheritDoc} */
+    @Override protected boolean keepSerializedObjects() {
+        return true;
+    }
+
     /**
      * Test that H2 specific error codes get propagated to Ignite SQL exceptions.
      * @throws SQLException if failed.
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractSelfTest.java
index 37f7f21..f708641 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractSelfTest.java
@@ -170,4 +170,9 @@ public class JdbcThinAbstractSelfTest extends GridCommonAbstractTest {
                 return Collections.emptyList();
         }
     }
+
+    /** {@inheritDoc} */
+    @Override protected boolean keepSerializedObjects() {
+        return true;
+    }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 249ecc8..2e4f820 100755
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -2416,7 +2416,9 @@ public abstract class GridAbstractTest extends JUnit3TestLegacySupport {
         protected Object readResolve() throws ObjectStreamException {
             Object res = serializedObj.get(uuid);
 
-            assert res != null;
+            assert res != null
+                : "Failed to find serializable proxy with uuid=" + uuid
+                    + ". Try to set test property keepSerializedObjects to 'true' if object was removed after test";
 
             return res;
         }