ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [15/17] ignite git commit: 2064 Hotfix.
Date Wed, 09 Dec 2015 15:24:26 GMT
2064 Hotfix.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/637b79ad
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/637b79ad
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/637b79ad

Branch: refs/heads/ignite-1.5.1
Commit: 637b79ad8902da082178e3e9cb63d80beb382a63
Parents: 6791c50
Author: Anton Vinogradov <av@apache.org>
Authored: Wed Dec 9 18:18:52 2015 +0300
Committer: Anton Vinogradov <av@apache.org>
Committed: Wed Dec 9 18:18:52 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/portable/PortableClassDescriptor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/637b79ad/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
index ed65e63..50c8bb5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
@@ -795,7 +795,7 @@ public class PortableClassDescriptor {
      * @return {@code true} if to use, {@code false} otherwise.
      */
     private boolean initUseOptimizedMarshallerFlag() {
-        for (Class c = cls; !c.equals(Object.class); c = c.getSuperclass()) {
+        for (Class c = cls; c != null && !c.equals(Object.class); c = c.getSuperclass())
{
             try {
                 Method writeObj = c.getDeclaredMethod("writeObject", ObjectOutputStream.class);
                 Method readObj = c.getDeclaredMethod("readObject", ObjectInputStream.class);


Mime
View raw message