Fixed bug - false detection of circular reference

jsonrpc-java/src/main/java/org/json/rpc/client/JsonRpcInvoker.java

@@ -42,20 +42,30 @@ public final class JsonRpcInvoker {
 
     private final TypeChecker typeChecker;
 
+    private final Gson gson;
+
     public JsonRpcInvoker() {
-        this(new GsonTypeChecker());
+        this(new GsonTypeChecker(), new Gson());
+    }
+
+    public JsonRpcInvoker(Gson gson) {
+        this(new GsonTypeChecker(), gson);
     }
 
     public JsonRpcInvoker(TypeChecker typeChecker) {
+        this(typeChecker, new Gson());
+    }
+
+    public JsonRpcInvoker(TypeChecker typeChecker, Gson gson) {
         this.typeChecker = typeChecker;
+		this.gson = gson;
     }
 
     public <T> T get(final JsonRpcClientTransport transport, final String handle, final Class<T>... classes) {
         for (Class<T> clazz : classes) {
             typeChecker.isValidInterface(clazz);
         }
         return (T) Proxy.newProxyInstance(JsonRpcInvoker.class.getClassLoader(), classes, new InvocationHandler() {
-
             public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
                 return JsonRpcInvoker.this.invoke(handle, transport, method, args);
             }
@@ -68,8 +78,6 @@ private Object invoke(String handleName,
         int id = rand.nextInt(Integer.MAX_VALUE);
         String methodName = handleName + "." + method.getName();
 
-        Gson gson = new Gson();
-
         JsonObject req = new JsonObject();
         req.addProperty("id", id);
         req.addProperty("method", methodName);

jsonrpc-java/src/main/java/org/json/rpc/commons/GsonTypeChecker.java

@@ -85,7 +85,7 @@ private boolean isValidType(Class<?> clazz, boolean throwException, Set<Class<?>
         }
 
         boolean zeroArgConstructor = (clazz.getConstructors().length == 0);
-        for (Constructor c : clazz.getConstructors()) {
+        for (Constructor<?> c : clazz.getConstructors()) {
             if (c.getParameterTypes().length == 0) {
                 zeroArgConstructor = true;
                 break;
@@ -100,14 +100,12 @@ private boolean isValidType(Class<?> clazz, boolean throwException, Set<Class<?>
         }
 
         // avoid circular references
-        visited = (visited == null ? new HashSet<Class<?>>() : visited);
-        if (visited.contains(clazz)) {
-            if (throwException) {
-                throw new IllegalArgumentException("circular reference detected : " + clazz);
-            }
+        if(visited == null) visited = new HashSet<Class<?>>();
+        if (!visited.add(clazz)) {
+            if (throwException)
+				throw new IllegalArgumentException("circular reference detected : " + clazz);
             return false;
         }
-        visited.add(clazz);
 
         // Check for fields because Gson uses fields
         for (Field f : clazz.getDeclaredFields()) {
@@ -142,6 +140,7 @@ private boolean isValidType(Class<?> clazz, boolean throwException, Set<Class<?>
             }
         }
 
+        visited.remove(clazz);
 
         return true;
     }

jsonrpc-java/src/main/java/org/json/rpc/server/JsonRpcExecutor.java

@@ -56,14 +56,25 @@ public final class JsonRpcExecutor implements RpcIntroSpection {
 
     private final TypeChecker typeChecker;
     private volatile boolean locked;
+
+    private final Gson gson;
 
     public JsonRpcExecutor() {
-        this(new GsonTypeChecker());
+        this(new GsonTypeChecker(), new Gson());
+    }
+
+    public JsonRpcExecutor(Gson gson) {
+        this(new GsonTypeChecker(), gson);
     }
 
-    @SuppressWarnings("unchecked")
     public JsonRpcExecutor(TypeChecker typeChecker) {
+    	this(typeChecker, new Gson());
+    }
+
+    @SuppressWarnings("unchecked")
+    public JsonRpcExecutor(TypeChecker typeChecker, Gson gson) {
         this.typeChecker = typeChecker;
+		this.gson = gson;
         this.handlers = new HashMap<String, HandleEntry<?>>();
         addHandler("system", this, RpcIntroSpection.class);
     }
@@ -239,7 +250,7 @@ private JsonElement executeMethod(String methodName, JsonArray params) throws Th
             Object result = executableMethod.invoke(
                     handleEntry.getHandler(), getParameters(executableMethod, params));
 
-            return new Gson().toJsonTree(result);
+            return gson.toJsonTree(result);
         } catch (Throwable t) {
             if (t instanceof InvocationTargetException) {
                 t = ((InvocationTargetException) t).getTargetException();
@@ -261,7 +272,6 @@ public boolean canExecute(Method method, JsonArray params) {
 
     public Object[] getParameters(Method method, JsonArray params) {
         List<Object> list = new ArrayList<Object>();
-        Gson gson = new Gson();
         Class<?>[] types = method.getParameterTypes();
         for (int i = 0; i < types.length; i++) {
             JsonElement p = params.get(i);