[tinkerpop] branch master updated: Need to check for null in case the Graph or GraphProvider is some sort of interface

[sp...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 7a16bda  Need to check for null in case the Graph or GraphProvider is some sort of interface
     new 1f32f52  Merge branch 'tp33'
7a16bda is described below

commit 7a16bda2ba5eac3bdda72b6fc6f5d3e33af0bc96
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Fri Dec 14 15:45:38 2018 -0500

    Need to check for null in case the Graph or GraphProvider is some sort of interface
    
    Yes, that can happen......... CTR
---
 .../main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java
index ca1a7f3..ebb6a50 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java
@@ -151,7 +151,8 @@ public abstract class AbstractGremlinSuite extends Suite {
     }
 
     private static List<Graph.OptOut> getAllOptOuts(final Class<?> clazz) {
-        if (clazz == Object.class)
+        // we typically get a null class if this is called recursively and the original clazz was an interface
+        if (clazz == Object.class || null == clazz)
             return Collections.emptyList();
 
         return Stream.concat(getAllOptOuts(clazz.getSuperclass()).stream(),